2 files changed, 12 insertions, 9 deletions

diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 82de2d781f2e..8859fe2f5ac2 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -316,6 +316,7 @@ m8xx_ide_init_hwif_ports(hw_regs_t *hw, unsigned long data_port,
         }
 
         /* register routine to tune PIO mode */
+        ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].tuneproc = m8xx_ide_tuneproc;
 
         hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
@@ -402,6 +403,7 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
         }
 
         /* register routine to tune PIO mode */
+        ide_hwifs[data_port].pio_mask = ATA_PIO4;
         ide_hwifs[data_port].tuneproc = m8xx_ide_tuneproc;
 
         hw->ack_intr = (ide_ack_intr_t *) ide_interrupt_ack;
@@ -431,13 +433,12 @@ void m8xx_ide_init_hwif_ports (hw_regs_t *hw,
 static void
 m8xx_ide_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        ide_pio_data_t d;
 #if defined(CONFIG_IDE_8xx_PCCARD) || defined(CONFIG_IDE_8xx_DIRECT)
         volatile pcmconf8xx_t   *pcmp;
         ulong timing, mask, reg;
 #endif
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, &d);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
 
 #if 1
         printk("%s[%d] %s: best PIO mode: %d\n",
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index e46f47206542..33630ad3e794 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -615,24 +615,25 @@ out:
 static void
 pmac_ide_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        ide_pio_data_t d;
         u32 *timings;
         unsigned accessTicks, recTicks;
         unsigned accessTime, recTime;
         pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data;
-        
+        unsigned int cycle_time;
+
         if (pmif == NULL)
                 return;
                 
         /* which drive is it ? */
         timings = &pmif->timings[drive->select.b.unit & 0x01];
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, &d);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
+        cycle_time = ide_pio_cycle_time(drive, pio);
 
         switch (pmif->kind) {
         case controller_sh_ata6: {
                 /* 133Mhz cell */
-                u32 tr = kauai_lookup_timing(shasta_pio_timings, d.cycle_time);
+                u32 tr = kauai_lookup_timing(shasta_pio_timings, cycle_time);
                 if (tr == 0)
                         return;
                 *timings = ((*timings) & ~TR_133_PIOREG_PIO_MASK) | tr;
@@ -641,7 +642,7 @@ pmac_ide_tuneproc(ide_drive_t *drive, u8 pio)
         case controller_un_ata6:
         case controller_k2_ata6: {
                 /* 100Mhz cell */
-                u32 tr = kauai_lookup_timing(kauai_pio_timings, d.cycle_time);
+                u32 tr = kauai_lookup_timing(kauai_pio_timings, cycle_time);
                 if (tr == 0)
                         return;
                 *timings = ((*timings) & ~TR_100_PIOREG_PIO_MASK) | tr;
@@ -649,7 +650,7 @@ pmac_ide_tuneproc(ide_drive_t *drive, u8 pio)
                 }
         case controller_kl_ata4:
                 /* 66Mhz cell */
-                recTime = d.cycle_time - ide_pio_timings[pio].active_time
+                recTime = cycle_time - ide_pio_timings[pio].active_time
                                 - ide_pio_timings[pio].setup_time;
                 recTime = max(recTime, 150U);
                 accessTime = ide_pio_timings[pio].active_time;
@@ -665,7 +666,7 @@ pmac_ide_tuneproc(ide_drive_t *drive, u8 pio)
         default: {
                 /* 33Mhz cell */
                 int ebit = 0;
-                recTime = d.cycle_time - ide_pio_timings[pio].active_time
+                recTime = cycle_time - ide_pio_timings[pio].active_time
                                 - ide_pio_timings[pio].setup_time;
                 recTime = max(recTime, 150U);
                 accessTime = ide_pio_timings[pio].active_time;
@@ -1247,6 +1248,7 @@ pmac_ide_setup_device(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         hwif->cbl = pmif->cable_80 ? ATA_CBL_PATA80 : ATA_CBL_PATA40;
         hwif->drives[0].unmask = 1;
         hwif->drives[1].unmask = 1;
+        hwif->pio_mask = ATA_PIO4;
         hwif->tuneproc = pmac_ide_tuneproc;
         if (pmif->kind == controller_un_ata6
             || pmif->kind == controller_k2_ata6