Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 273b8385 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 486c92e2

drivers/ide/ide-generic.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/asm-alpha/ide.h

+0 −6
Original line number Diff line number Diff line
@@ -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__ */

include/asm-ia64/ide.h

+0 −6
Original line number Diff line number Diff line
@@ -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__ */

include/asm-m32r/ide.h

+0 −6
Original line number Diff line number Diff line
@@ -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__ */

include/asm-mips/mach-generic/ide.h

+0 −6
Original line number Diff line number Diff line
@@ -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)

{