ide: remove ide_init_default_irq() macro

* Use ide_default_irq() instead of ide_init_default_irq() in
  ide_generic host driver (so the correct IRQ is always set
  regardless of CONFIG_PCI / CONFIG_BLK_DEV_IDEPCI).

* Remove no longer needed ide_init_default_irq() macro.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 4f996d01587a8695a0baba876aff363dcf696280..25fda0a3263fea4603d67121f4b0df29b2195a54 100644 (file)
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -97,7 +97,7 @@ static int __init ide_generic_init(void)
                if (hwif->chipset == ide_unknown && io_addr) {
                        memset(&hw, 0, sizeof(hw));
                        ide_std_init_ports(&hw, io_addr, io_addr + 0x206);
-                       hw.irq = ide_init_default_irq(io_addr);
+                       hw.irq = ide_default_irq(io_addr);
                        ide_init_port_hw(hwif, &hw);
 
                        idx[i] = i;

diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h
index e67c38c96a6b52263e7288149cf57fbe8630c280..f44129abc02cd7bd356fe13e4dec1a8f838c8d81 100644 (file)
--- a/include/asm-alpha/ide.h
+++ b/include/asm-alpha/ide.h
@@ -37,12 +37,6 @@ static inline unsigned long ide_default_io_base(int index)
        }
 }
 
-#ifdef CONFIG_PCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h
index 989edb6f1285610ac06f9ea1b79c3ea78b828c56..8fa3f8cd067aa1f8769fe0131635ebdcea5791f0 100644 (file)
--- a/include/asm-ia64/ide.h
+++ b/include/asm-ia64/ide.h
@@ -44,12 +44,6 @@ static inline unsigned long ide_default_io_base(int index)
        }
 }
 
-#ifdef CONFIG_PCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h
index 41bd33861ebee3ccd592a807ed45f7583dc0ba85..1e7f6474d1307578cfa8bb59a80f896a5d06abe8 100644 (file)
--- a/include/asm-m32r/ide.h
+++ b/include/asm-m32r/ide.h
@@ -63,12 +63,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
        }
 }
 
-#ifdef CONFIG_BLK_DEV_IDEPCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */

diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 7a9093187fe9045be0761bf4fabb9edc7b9bad48..0f6c251f5fec20d6668f1bf102edcc33253f5e6b 100644 (file)
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -96,12 +96,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
        }
 }
 
-#ifdef CONFIG_BLK_DEV_IDEPCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 /* MIPS port and memory-mapped I/O string operations.  */
 static inline void __ide_flush_prologue(void)
 {

diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h
index 17c51efff67ce14386e7ed7b81d774dce5e78d3b..3d90bf7d3d73ed19ae011c20b576f422b07e5868 100644 (file)
--- a/include/asm-powerpc/ide.h
+++ b/include/asm-powerpc/ide.h
@@ -73,12 +73,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
        return 0;
 }
 
-#ifdef CONFIG_PCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #ifdef CONFIG_BLK_DEV_MPC8xx_IDE
 #define IDE_ARCH_ACK_INTR  1
 #define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)

diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index 800edccd33f1a8ca74f7b702059438a507b9d56a..cf9c98e5bdb58a045eaf557f57218fe791d64970 100644 (file)
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -58,12 +58,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
        }
 }
 
-#ifdef CONFIG_BLK_DEV_IDEPCI
-#define ide_init_default_irq(base)     (0)
-#else
-#define ide_init_default_irq(base)     ide_default_irq(base)
-#endif
-
 #include <asm-generic/ide_iops.h>
 
 #endif /* __KERNEL__ */