leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: remove ide_default_io_ctl() macro

Browse Source 
It is always == '((base) + 0x206)' if CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS=y
and it is not needed otherwise (arm, blackfin, parisc, ppc64, sh, sparc[64]).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-04-18 00:46:34 +02:00
parent 5c50427090
commit 9dfcd15a6d
13 changed files with 1 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/ide.c
View File

@ -202,7 +202,7 @@ static void __init init_ide_data (void)
for (index = 0; index < MAX_HWIFS; ++index) { for (index = 0; index < MAX_HWIFS; ++index) {
ide_hwif_t *hwif = &ide_hwifs[index]; ide_hwif_t *hwif = &ide_hwifs[index];
unsigned long io_addr = ide_default_io_base(index); unsigned long io_addr = ide_default_io_base(index);
unsigned long ctl_addr = ide_default_io_ctl(io_addr); unsigned long ctl_addr = io_addr + 0x206;
ide_init_port_data(hwif, index); ide_init_port_data(hwif, index);

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

@ -37,8 +37,6 @@ static inline unsigned long ide_default_io_base(int index)
} }
} }
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
#else #else

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

@ -17,14 +17,6 @@
#define MAX_HWIFS 4 #define MAX_HWIFS 4
#endif #endif
#if !defined(CONFIG_ARCH_L7200)
# ifdef CONFIG_ARCH_CLPS7500
# define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
# else
# define ide_default_io_ctl(base) (0)
# endif
#endif /* !ARCH_L7200 */
#define __ide_mm_insw(port,addr,len) readsw(port,addr,len) #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_insl(port,addr,len) readsl(port,addr,len)
#define __ide_mm_outsw(port,addr,len) writesw(port,addr,len) #define __ide_mm_outsw(port,addr,len) writesw(port,addr,len)

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

@ -19,10 +19,6 @@
#define MAX_HWIFS 1 #define MAX_HWIFS 1
/* Legacy ... BLK_DEV_IDECS */
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#include <asm-generic/ide_iops.h> #include <asm-generic/ide_iops.h>
/****************************************************************************/ /****************************************************************************/

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

@ -44,8 +44,6 @@ static inline unsigned long ide_default_io_base(int index)
} }
} }
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
#else #else

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

@ -63,8 +63,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
} }
} }
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
#else #else

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

@ -96,8 +96,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
} }
} }
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
#else #else

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

@ -17,8 +17,6 @@
#define MAX_HWIFS 2 #define MAX_HWIFS 2
#endif #endif
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id)) #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_free_irq(irq,dev_id) free_irq((irq), (dev_id))
#define ide_request_region(from,extent,name) request_region((from), (extent), (name)) #define ide_request_region(from,extent,name) request_region((from), (extent), (name))

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

@ -86,8 +86,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _ASM_POWERPC_IDE_H */ #endif /* _ASM_POWERPC_IDE_H */

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

@ -14,9 +14,6 @@
#ifdef __KERNEL__ #ifdef __KERNEL__
#define ide_default_io_ctl(base) (0)
#include <asm-generic/ide_iops.h> #include <asm-generic/ide_iops.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */

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

@ -17,8 +17,6 @@
#undef MAX_HWIFS #undef MAX_HWIFS
#define MAX_HWIFS 2 #define MAX_HWIFS 2
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define __ide_insl(data_reg, buffer, wcount) \ #define __ide_insl(data_reg, buffer, wcount) \
__ide_insw(data_reg, buffer, (wcount)<<1) __ide_insw(data_reg, buffer, (wcount)<<1)
#define __ide_outsl(data_reg, buffer, wcount) \ #define __ide_outsl(data_reg, buffer, wcount) \

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

@ -24,8 +24,6 @@
# endif # endif
#endif #endif
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define __ide_insl(data_reg, buffer, wcount) \ #define __ide_insl(data_reg, buffer, wcount) \
__ide_insw(data_reg, buffer, (wcount)<<1) __ide_insw(data_reg, buffer, (wcount)<<1)
#define __ide_outsl(data_reg, buffer, wcount) \ #define __ide_outsl(data_reg, buffer, wcount) \

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

@ -58,8 +58,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
} }
} }
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
#define ide_init_default_irq(base) (0) #define ide_init_default_irq(base) (0)
#else #else