ide: remove ide_default_io_ctl() macro

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>

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 9b9b686fbacb6789a55f1bee0f0f90f2e78a75c8..a93f127b8bf2729780bdf08695449683448295b4 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -202,7 +202,7 @@ static void __init init_ide_data (void)
        for (index = 0; index < MAX_HWIFS; ++index) {
                ide_hwif_t *hwif = &ide_hwifs[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);
 

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index a2feed30bb68b58b2e2c9308fecf2d31767d1f8f..e67c38c96a6b52263e7288149cf57fbe8630c280 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -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
 #define ide_init_default_irq(base)     (0)
 #else

diff --git a/include/asm-arm/ide.h b/include/asm-arm/ide.h
index f348fcf3150b982bd82192d68a820419f675b78e..88f4d231ce4f2579a27cfb9daba5bb824b6c6664 100644 (file)
--- a/include/asm-arm/ide.h
+++ b/include/asm-arm/ide.h
@@ -17,14 +17,6 @@
 #define MAX_HWIFS      4
 #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_insl(port,addr,len)   readsl(port,addr,len)
 #define __ide_mm_outsw(port,addr,len)  writesw(port,addr,len)

diff --git a/include/asm-blackfin/ide.h b/include/asm-blackfin/ide.h
index 121e272581d68a53225b0941b63bca62cee57036..5b88de115bf418acaf476d090ae656fd22c3eb1a 100644 (file)
--- a/include/asm-blackfin/ide.h
+++ b/include/asm-blackfin/ide.h
@@ -19,10 +19,6 @@
 
 #define MAX_HWIFS      1
 
-/* Legacy ... BLK_DEV_IDECS */
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
-
 #include <asm-generic/ide_iops.h>
 
 /****************************************************************************/

diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 09c2a05e1c8a6b117cdf4bca1774fb76c2ff3621..989edb6f1285610ac06f9ea1b79c3ea78b828c56 100644 (file)
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -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
 #define ide_init_default_irq(base)     (0)
 #else

diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index feb7f0d7aca92ee6733e31683891c9b5041203b5..41bd33861ebee3ccd592a807ed45f7583dc0ba85 100644 (file)
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -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
 #define ide_init_default_irq(base)     (0)
 #else

diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 45e24474cf43ca340d51acdeb206db86f9ce0d50..7a9093187fe9045be0761bf4fabb9edc7b9bad48 100644 (file)
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -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
 #define ide_init_default_irq(base)     (0)
 #else

diff --git a/include/asm-parisc/ide.h b/include/asm-parisc/ide.h
index be8760fbc8ee4042ded80ff196b4f9ce70335aa0..db0c944100953a1ce46ab8d7caa00f3a81314317 100644 (file)
--- a/include/asm-parisc/ide.h
+++ b/include/asm-parisc/ide.h
@@ -17,8 +17,6 @@
 #define MAX_HWIFS      2
 #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_free_irq(irq,dev_id)               free_irq((irq), (dev_id))
 #define ide_request_region(from,extent,name)   request_region((from), (extent), (name))

diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index fef2ef1dbe867f152c3fcc68290f4c4d0c5ed0b4..17c51efff67ce14386e7ed7b81d774dce5e78d3b 100644 (file)
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -86,8 +86,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
 
 #endif /* __powerpc64__ */
 
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
 #endif /* __KERNEL__ */
 
 #endif /* _ASM_POWERPC_IDE_H */

diff --git a/include/asm-sh/ide.h b/include/asm-sh/ide.h
index 9f8e9142dc33b68ff8f737682ff5d8ac16d5ca84..58e0bdd52be45827aef0ffbdccd3098527d902c5 100644 (file)
--- a/include/asm-sh/ide.h
+++ b/include/asm-sh/ide.h
@@ -14,9 +14,6 @@
 
 #ifdef __KERNEL__
 
-
-#define ide_default_io_ctl(base)       (0)
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index 4076cb5d1581cdbcce73bac0e2c9cc5974064db2..afd1736ed4804d85c0b4099f764d613e4b45a69b 100644 (file)
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -17,8 +17,6 @@
 #undef  MAX_HWIFS
 #define MAX_HWIFS      2
 
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
 #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 ac7eb210b941edfbd69bbde7d4f4b45cc34e8289..c5fdabe0b42d2918b629bd945ee30c1366e32be9 100644 (file)
--- a/include/asm-sparc64/ide.h
+++ b/include/asm-sparc64/ide.h
@@ -24,8 +24,6 @@
 # endif
 #endif
 
-#define ide_default_io_ctl(base)       ((base) + 0x206) /* obsolete */
-
 #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-x86/ide.h b/include/asm-x86/ide.h
index 58080a7111dec8f285d02af56a2f4517fd91033a..800edccd33f1a8ca74f7b702059438a507b9d56a 100644 (file)
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -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
 #define ide_init_default_irq(base)     (0)
 #else