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: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index df2e92034f5..5f0da35ab5a 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -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
          */