OpenSDV
/
original_kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-04-18 00:46:35 +02:00
parent 486c92e290
commit 273b8385e5
7 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/ide-generic.c
View File

@ -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;

6
include/asm-alpha/ide.h
View File

@ -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__ */

6
include/asm-ia64/ide.h
View File

@ -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__ */

6
include/asm-m32r/ide.h
View File

@ -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__ */

6
include/asm-mips/mach-generic/ide.h
View File

@ -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)
{

6
include/asm-powerpc/ide.h
View File

@ -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)

6
include/asm-x86/ide.h
View File

@ -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__ */