diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:35 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-18 00:46:35 +0200 |
| commit | 273b8385e5817a4765f82257004c5ec661a6a5b2 (patch) | |
| tree | 76ae63e30433fe2676c145421a1963a71f834ef0 | |
| parent | 486c92e2900d618c650a7099536310651aa6cf1b (diff) | |
| download | linux-273b8385e5817a4765f82257004c5ec661a6a5b2.tar.gz linux-273b8385e5817a4765f82257004c5ec661a6a5b2.tar.bz2 linux-273b8385e5817a4765f82257004c5ec661a6a5b2.zip | |
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>
| -rw-r--r-- | drivers/ide/ide-generic.c | 2 | ||||
| -rw-r--r-- | include/asm-alpha/ide.h | 6 | ||||
| -rw-r--r-- | include/asm-ia64/ide.h | 6 | ||||
| -rw-r--r-- | include/asm-m32r/ide.h | 6 | ||||
| -rw-r--r-- | include/asm-mips/mach-generic/ide.h | 6 | ||||
| -rw-r--r-- | include/asm-powerpc/ide.h | 6 | ||||
| -rw-r--r-- | include/asm-x86/ide.h | 6 |
7 files changed, 1 insertions, 37 deletions
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c index 4f996d01587a..25fda0a3263f 100644 --- 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 e67c38c96a6b..f44129abc02c 100644 --- 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 989edb6f1285..8fa3f8cd067a 100644 --- 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 41bd33861ebe..1e7f6474d130 100644 --- 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 7a9093187fe9..0f6c251f5fec 100644 --- 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 17c51efff67c..3d90bf7d3d73 100644 --- 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 800edccd33f1..cf9c98e5bdb5 100644 --- 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__ */ |