From b0134e31c10bd06dc44db6af3aeb1f947e32cf96 Mon Sep 17 00:00:00 2001 From: Bartlomiej Zolnierkiewicz Date: Wed, 2 Jun 2004 09:47:30 -0700 Subject: [PATCH] [PATCH] ide: add IDE_ARCH_OBSOLETE_DEFAULTS per jgarzik's suggestion Define it in if ide_default_io_base(), ide_default_irq() and ide_init_default_irq() are needed. Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Linus Torvalds --- include/asm-alpha/ide.h | 2 ++ include/asm-arm/ide.h | 9 --------- include/asm-arm26/ide.h | 9 --------- include/asm-h8300/ide.h | 5 ----- include/asm-i386/ide.h | 2 ++ include/asm-ia64/ide.h | 2 ++ include/asm-m68k/ide.h | 13 ------------- include/asm-mips/mach-generic/ide.h | 2 ++ include/asm-parisc/ide.h | 5 ----- include/asm-ppc/ide.h | 2 ++ include/asm-ppc64/ide.h | 5 ----- include/asm-sh/ide.h | 2 ++ include/asm-sparc/ide.h | 12 ------------ include/asm-sparc64/ide.h | 12 ------------ include/linux/ide.h | 7 +++++++ 15 files changed, 19 insertions(+), 70 deletions(-) diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index 6624e5422421f..68934a25931f7 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h @@ -19,6 +19,8 @@ #define MAX_HWIFS CONFIG_IDE_MAX_HWIFS #endif +#define IDE_ARCH_OBSOLETE_DEFAULTS + static inline int ide_default_irq(unsigned long base) { switch (base) { diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h index d43dee139c591..b2b9b3da6c317 100644 --- a/include/asm-arm/ide.h +++ b/include/asm-arm/ide.h @@ -21,13 +21,6 @@ # include /* obsolete + broken */ #endif -/* - * We always use the new IDE port registering, - * so these are fixed here. - */ -#define ide_default_io_base(i) (0) -#define ide_default_irq(b) (0) - #if !defined(CONFIG_ARCH_L7200) && !defined(CONFIG_ARCH_LH7A40X) # define IDE_ARCH_OBSOLETE_INIT # ifdef CONFIG_ARCH_CLPS7500 @@ -37,8 +30,6 @@ # endif #endif /* !ARCH_L7200 && !ARCH_LH7A40X */ -#define ide_init_default_irq(base) (0) - #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) diff --git a/include/asm-arm26/ide.h b/include/asm-arm26/ide.h index 2d29108ec1007..db804d751df94 100644 --- a/include/asm-arm26/ide.h +++ b/include/asm-arm26/ide.h @@ -26,15 +26,6 @@ #define __ide_mm_outsw(port,addr,len) writesw(port,addr,len) #define __ide_mm_outsl(port,addr,len) writesl(port,addr,len) -#define ide_init_default_irq(base) (0) - -/* - * We always use the new IDE port registering, - * so these are fixed here. - */ -#define ide_default_io_base(i) (0) -#define ide_default_irq(b) (0) - #define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl(base) (0) diff --git a/include/asm-h8300/ide.h b/include/asm-h8300/ide.h index b24fc9be1d55f..f8535ce7476e4 100644 --- a/include/asm-h8300/ide.h +++ b/include/asm-h8300/ide.h @@ -16,11 +16,6 @@ #ifdef __KERNEL__ /****************************************************************************/ -#define ide_default_irq(base) (0) -#define ide_default_io_base(index) (0) - -#define ide_init_default_irq(base) (0) - #define MAX_HWIFS 1 #include diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h index d13334817b7fb..0409c22f1c523 100644 --- a/include/asm-i386/ide.h +++ b/include/asm-i386/ide.h @@ -23,6 +23,8 @@ # endif #endif +#define IDE_ARCH_OBSOLETE_DEFAULTS + static __inline__ int ide_default_irq(unsigned long base) { switch (base) { diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h index 2adbd91a40c8c..e62b95301d513 100644 --- a/include/asm-ia64/ide.h +++ b/include/asm-ia64/ide.h @@ -25,6 +25,8 @@ # endif #endif +#define IDE_ARCH_OBSOLETE_DEFAULTS + static inline int ide_default_irq(unsigned long base) { switch (base) { diff --git a/include/asm-m68k/ide.h b/include/asm-m68k/ide.h index c96054399e5c6..36118fd018679 100644 --- a/include/asm-m68k/ide.h +++ b/include/asm-m68k/ide.h @@ -50,19 +50,6 @@ #define MAX_HWIFS 4 /* same as the other archs */ #endif - -static __inline__ int ide_default_irq(unsigned long base) -{ - return 0; -} - -static __inline__ unsigned long ide_default_io_base(int index) -{ - return 0; -} - -#define ide_init_default_irq(base) (0) - /* * 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 diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index b70b1ec05fe6b..fa2760afa51cd 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h @@ -20,6 +20,8 @@ # endif #endif +#define IDE_ARCH_OBSOLETE_DEFAULTS + static inline int ide_default_irq(unsigned long base) { switch (base) { diff --git a/include/asm-parisc/ide.h b/include/asm-parisc/ide.h index c2df5fce0da2b..15a9374c1c0f8 100644 --- a/include/asm-parisc/ide.h +++ b/include/asm-parisc/ide.h @@ -19,14 +19,9 @@ #define MAX_HWIFS 2 #endif -#define ide_default_irq(base) (0) -#define ide_default_io_base(index) (0) - #define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ -#define ide_init_default_irq(base) (0) - #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_check_region(from,extent) check_region((from), (extent)) diff --git a/include/asm-ppc/ide.h b/include/asm-ppc/ide.h index fbcddf33cdba4..6c091582d1cb4 100644 --- a/include/asm-ppc/ide.h +++ b/include/asm-ppc/ide.h @@ -43,6 +43,8 @@ extern struct ide_machdep_calls ppc_ide_md; #undef SUPPORT_SLOW_DATA_PORTS #define SUPPORT_SLOW_DATA_PORTS 0 +#define IDE_ARCH_OBSOLETE_DEFAULTS + static __inline__ int ide_default_irq(unsigned long base) { if (ppc_ide_md.default_irq) diff --git a/include/asm-ppc64/ide.h b/include/asm-ppc64/ide.h index a06fef9f9efb3..00df66e0e5fc6 100644 --- a/include/asm-ppc64/ide.h +++ b/include/asm-ppc64/ide.h @@ -22,14 +22,9 @@ # define MAX_HWIFS 4 #endif -static inline int ide_default_irq(unsigned long base) { return 0; } -static inline unsigned long ide_default_io_base(int index) { return 0; } - #define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ -#define ide_init_default_irq(base) (0) - #endif /* __KERNEL__ */ #endif /* __ASMPPC64_IDE_H */ diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h index c88ba763cc547..7758b3ec3a47e 100644 --- a/include/asm-sh/ide.h +++ b/include/asm-sh/ide.h @@ -22,6 +22,8 @@ #define MAX_HWIFS 2 #endif +#define IDE_ARCH_OBSOLETE_DEFAULTS + static inline int ide_default_irq_hp600(unsigned long base) { switch (base) { diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h index 6e8468f967585..64d810385ea41 100644 --- a/include/asm-sparc/ide.h +++ b/include/asm-sparc/ide.h @@ -19,21 +19,9 @@ #undef MAX_HWIFS #define MAX_HWIFS 2 -static __inline__ int ide_default_irq(unsigned long base) -{ - return 0; -} - -static __inline__ unsigned long ide_default_io_base(int index) -{ - return 0; -} - #define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ -#define ide_init_default_irq(base) (0) - #define __ide_insl(data_reg, buffer, wcount) \ __ide_insw(data_reg, buffer, (wcount)<<1) #define __ide_outsl(data_reg, buffer, wcount) \ diff --git a/include/asm-sparc64/ide.h b/include/asm-sparc64/ide.h index f4e62012cd994..f850b61ab88b1 100644 --- a/include/asm-sparc64/ide.h +++ b/include/asm-sparc64/ide.h @@ -24,21 +24,9 @@ # endif #endif -static __inline__ int ide_default_irq(unsigned long base) -{ - return 0; -} - -static __inline__ unsigned long ide_default_io_base(int index) -{ - return 0; -} - #define IDE_ARCH_OBSOLETE_INIT #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ -#define ide_init_default_irq(base) (0) - #define __ide_insl(data_reg, buffer, wcount) \ __ide_insw(data_reg, buffer, (wcount)<<1) #define __ide_outsl(data_reg, buffer, wcount) \ diff --git a/include/linux/ide.h b/include/linux/ide.h index d74a18ca3d48a..8a773de2c0378 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -305,6 +305,13 @@ static inline void ide_std_init_ports(hw_regs_t *hw, #include +/* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */ +#ifndef IDE_ARCH_OBSOLETE_DEFAULTS +# define ide_default_io_base(index) (0) +# define ide_default_irq(base) (0) +# define ide_init_default_irq(base) (0) +#endif + /* * ide_init_hwif_ports() is OBSOLETE and will be removed in 2.7 series. * New ports shouldn't define IDE_ARCH_OBSOLETE_INIT in . -- 2.53.0