korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 20:48:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

ide: define MAX_HWIFS in <linux/ide.h>

Browse Source 
* Now that ide_hwif_t instances are allocated dynamically
  the difference between MAX_HWIFS == 2 and MAX_HWIFS == 10
  is ~100 bytes (x86-32) so use MAX_HWIFS == 10 on all archs
  except these ones that use MAX_HWIFS == 1.

* Define MAX_HWIFS in <linux/ide.h> instead of <asm/ide.h>.

[ Please note that avr32/cris/v850 have no <asm/ide.h>
  and alpha/ia64/sh always define CONFIG_IDE_MAX_HWIFS. ]

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-07-24 22:53:30 +02:00
parent 2c9d86438a
commit d83b8b85cd
14 changed files with 8 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/asm-arm/ide.h
View File

@ -13,10 +13,6 @@
#ifdef __KERNEL__
#ifndef MAX_HWIFS
#define MAX_HWIFS 4
#endif
#define __ide_mm_insw(port,addr,len) readsw(port,addr,len)
#define __ide_mm_insl(port,addr,len) readsl(port,addr,len)
#define __ide_mm_outsw(port,addr,len) writesw(port,addr,len)

2
include/asm-blackfin/ide.h
View File

@ -17,8 +17,6 @@
#ifdef __KERNEL__
/****************************************************************************/
#define MAX_HWIFS 1
#include <asm-generic/ide_iops.h>
/****************************************************************************/

4
include/asm-frv/ide.h
View File

@ -18,10 +18,6 @@
#include <asm/io.h>
#include <asm/irq.h>
#ifndef MAX_HWIFS
#define MAX_HWIFS 8
#endif
/****************************************************************************/
/*
* some bits needed for parts of the IDE subsystem to compile

2
include/asm-h8300/ide.h
View File

@ -16,8 +16,6 @@
#ifdef __KERNEL__
/****************************************************************************/
#define MAX_HWIFS 1
#include <asm-generic/ide_iops.h>
/****************************************************************************/

8
include/asm-m32r/ide.h
View File

@ -15,14 +15,6 @@
#include <asm/m32r.h>
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#define MAX_HWIFS 10
# else
#define MAX_HWIFS 2
# endif
#endif
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {

4
include/asm-m68k/ide.h
View File

@ -45,10 +45,6 @@
#include <asm/macints.h>
#endif
#ifndef MAX_HWIFS
#define MAX_HWIFS 4 /* same as the other archs */
#endif
/*
* Get rid of defs from io.h - ide has its private and conflicting versions
* Since so far no single m68k platform uses ISA/PCI I/O space for IDE, we

8
include/asm-mips/mach-generic/ide.h
View File

@ -19,14 +19,6 @@
#include <linux/stddef.h>
#include <asm/processor.h>
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#define MAX_HWIFS 10
# else
#define MAX_HWIFS 6
# endif
#endif
static __inline__ int ide_probe_legacy(void)
{
#ifdef CONFIG_PCI

4
include/asm-mn10300/ide.h
View File

@ -23,10 +23,6 @@
#undef SUPPORT_VLB_SYNC
#define SUPPORT_VLB_SYNC 0
#ifndef MAX_HWIFS
#define MAX_HWIFS 8
#endif
/*
* some bits needed for parts of the IDE subsystem to compile
*/

4
include/asm-parisc/ide.h
View File

@ -13,10 +13,6 @@
#ifdef __KERNEL__
#ifndef MAX_HWIFS
#define MAX_HWIFS 2
#endif
#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id))
#define ide_free_irq(irq,dev_id) free_irq((irq), (dev_id))
#define ide_request_region(from,extent,name) request_region((from), (extent), (name))

8
include/asm-powerpc/ide.h
View File

@ -14,14 +14,6 @@
#endif
#include <asm/io.h>
#ifndef MAX_HWIFS
#ifdef __powerpc64__
#define MAX_HWIFS 10
#else
#define MAX_HWIFS 8
#endif
#endif
#define __ide_mm_insw(p, a, c) readsw((void __iomem *)(p), (a), (c))
#define __ide_mm_insl(p, a, c) readsl((void __iomem *)(p), (a), (c))
#define __ide_mm_outsw(p, a, c) writesw((void __iomem *)(p), (a), (c))

3
include/asm-sparc/ide.h
View File

@ -21,9 +21,6 @@
#include <asm/psr.h>
#endif
#undef MAX_HWIFS
#define MAX_HWIFS 2
#define __ide_insl(data_reg, buffer, wcount) \
__ide_insw(data_reg, buffer, (wcount)<<1)
#define __ide_outsl(data_reg, buffer, wcount) \

9
include/asm-x86/ide.h
View File

@ -11,15 +11,6 @@
#ifdef __KERNEL__
#ifndef MAX_HWIFS
# ifdef CONFIG_BLK_DEV_IDEPCI
#define MAX_HWIFS 10
# else
#define MAX_HWIFS 6
# endif
#endif
static __inline__ int ide_default_irq(unsigned long base)
{
switch (base) {

5
include/asm-xtensa/ide.h
View File

@ -14,11 +14,6 @@
#ifdef __KERNEL__
#ifndef MAX_HWIFS
# define MAX_HWIFS 1
#endif
#include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */

8
include/linux/ide.h
View File

@ -213,6 +213,14 @@ static inline int __ide_default_irq(unsigned long base)
#include <asm/ide.h>
#ifndef MAX_HWIFS
#if defined(CONFIG_BLACKFIN) || defined(CONFIG_H8300) || defined(CONFIG_XTENSA)
# define MAX_HWIFS 1
#else
# define MAX_HWIFS 10
#endif
#endif
#if !defined(MAX_HWIFS) || defined(CONFIG_EMBEDDED)
#undef MAX_HWIFS
#define MAX_HWIFS CONFIG_IDE_MAX_HWIFS