[PATCH] ide: add IDE_ARCH_OBSOLETE_DEFAULTS

per jgarzik's suggestion

Define it in <asm/ide.h> if ide_default_io_base(),
ide_default_irq() and ide_init_default_irq() are needed.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@elka.pw.edu.pl>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index 6624e5422421ff6688c1e6ca4b0d1952f29be6c3..68934a25931f7a7928f5ec1a8133027a8bbbef43 100644 (file)
--- 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 d43dee139c59174875481fbd6bb42305af3b2658..b2b9b3da6c3173455be7c6b5590aea9d7b3ee63c 100644 (file)
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -21,13 +21,6 @@
 # include <asm/arch/ide.h>     /* 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 2d29108ec10076a0373c11db388f87320e454921..db804d751df9439f3a8cb3a24888cb1e53f162f5 100644 (file)
--- 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 b24fc9be1d55f7afc69dcdfb73bce153365c904c..f8535ce7476e4cb7146b0d9cae054d55c2e986df 100644 (file)
--- 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 <asm-generic/ide_iops.h>

diff --git a/include/asm-i386/ide.h b/include/asm-i386/ide.h
index d13334817b7fb8ce7f538e3cd2da22786ff5d7ca..0409c22f1c523834500c5d425e628209df2cc268 100644 (file)
--- 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 2adbd91a40c8c8b43a787c144dde855cb248960a..e62b95301d513321befd401291a90d6c867f4325 100644 (file)
--- 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 c96054399e5c6d7fdaf7f8052ee9ff20af8030cd..36118fd01867967e11441e80485c721f14fa688b 100644 (file)
--- 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 b70b1ec05fe6b7f937fd96e2059dd9662d17d7ba..fa2760afa51cd367c3bc31af465ca6153200ae65 100644 (file)
--- 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 c2df5fce0da2b93e321198333037492ae0d9304c..15a9374c1c0f84f5c2426ce048d84c0abbb5e658 100644 (file)
--- 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 fbcddf33cdba44c6306e636f6a41b202fcac446c..6c091582d1cb4d5696df200cc78a431616425023 100644 (file)
--- 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 a06fef9f9efb3859113697072b5f7c20e5f5b21f..00df66e0e5fc6f67089e1a94585d062567129c24 100644 (file)
--- 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 c88ba763cc547b4120c6bd53b8f4f6c9e8590830..7758b3ec3a47e3afdf5a26fb196214631c46b768 100644 (file)
--- 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 6e8468f967585bce3b535d30b8eac629a53b8505..64d810385ea410d9ffb7217ec3e854107684b12e 100644 (file)
--- 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 f4e62012cd9941e508721569c65a235d1706b9bf..f850b61ab88b14ddbaf1c8b353f9696ee776290e 100644 (file)
--- 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 d74a18ca3d48aaacd3653394a4cc32202ef36127..8a773de2c037875456bb917f562dbd0d42624c3a 100644 (file)
--- 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 <asm/ide.h>
 
+/* 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 <asm/ide.h>.