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

Commit 18e181fe authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add hwif->ack_intr hook 



* Add hwif->ack_intr hook and use it instead of hwif->hw.ack_intr.

* Add missing brackets to cris-v32 and powerpc ide_ack_intr() macros.

Cc: Roman Zippel <zippel@linux-m68k.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 86f3a492

drivers/ide/ide.c

+1 −0
Original line number Diff line number Diff line
@@ -737,6 +737,7 @@ int ide_register_hw(hw_regs_t *hw, void (*fixup)(ide_hwif_t *), 
	hwif->fixup = fixup;

	hwif->chipset = hw->chipset;

	hwif->gendev.parent = hw->dev;

	hwif->ack_intr = hw->ack_intr;



	if (initializing == 0) {

		u8 idx[4] = { index, 0xff, 0xff, 0xff };

drivers/ide/ppc/mpc8xx.c

+2 −2
Original line number Diff line number Diff line
@@ -316,8 +316,8 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port, 


	ide_hwifs[data_port].pio_mask = ATA_PIO4;

	ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;

	ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;



	hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;

	/* Enable Harddisk Interrupt,

	 * and make it edge sensitive

	 */
@@ -402,8 +402,8 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw, 


	ide_hwifs[data_port].pio_mask = ATA_PIO4;

	ide_hwifs[data_port].set_pio_mode = m8xx_ide_set_pio_mode;

	ide_hwifs[data_port].ack_intr = (ide_ack_intr_t *)ide_interrupt_ack;



	hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;

	/* Enable Harddisk Interrupt,

	 * and make it edge sensitive

	 */

include/asm-cris/arch-v32/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static inline unsigned long ide_default_io_base(int index) 
#define SUPPORT_VLB_SYNC 0



#define IDE_ARCH_ACK_INTR

#define ide_ack_intr(hwif)	(hwif)->hw.ack_intr(hwif)

#define ide_ack_intr(hwif)	((hwif)->ack_intr(hwif))



#endif /* __KERNEL__ */

include/asm-m68k/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ ide_get_lock(irq_handler_t handler, void *data) 
#endif /* CONFIG_BLK_DEV_FALCON_IDE */



#define IDE_ARCH_ACK_INTR

#define ide_ack_intr(hwif)	((hwif)->hw.ack_intr ? (hwif)->hw.ack_intr(hwif) : 1)

#define ide_ack_intr(hwif)	((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)



#endif /* __KERNEL__ */

#endif /* _M68K_IDE_H */

include/asm-powerpc/ide.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static __inline__ unsigned long ide_default_io_base(int index) 


#ifdef CONFIG_BLK_DEV_MPC8xx_IDE

#define IDE_ARCH_ACK_INTR  1

#define ide_ack_intr(hwif) (hwif->hw.ack_intr ? hwif->hw.ack_intr(hwif) : 1)

#define ide_ack_intr(hwif) ((hwif)->ack_intr ? (hwif)->ack_intr(hwif) : 1)

#endif



#endif /* __powerpc64__ */