36 files changed, 42 insertions, 48 deletions

diff --git a/drivers/ide/ide-lib.c b/drivers/ide/ide-lib.c
index 6e85bee0bef7..df29868209f3 100644
--- a/drivers/ide/ide-lib.c
+++ b/drivers/ide/ide-lib.c
@@ -277,7 +277,6 @@ EXPORT_SYMBOL_GPL(ide_pio_cycle_time);
  *      @drive: drive to consider
  *      @mode_wanted: preferred mode
  *      @max_mode: highest allowed mode
- *      @d: PIO data
  *
  *      This routine returns the recommended PIO settings for a given drive,
  *      based on the drive->id information and the ide_pio_blacklist[].
@@ -286,7 +285,7 @@ EXPORT_SYMBOL_GPL(ide_pio_cycle_time);
  *      This is used by most chipset support modules when "auto-tuning".
  */
 
-u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_pio_data_t *d)
+u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
 {
         int pio_mode;
         struct hd_driveid* id = drive->id;
@@ -335,9 +334,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
         if (pio_mode > max_mode)
                 pio_mode = max_mode;
 
-        if (d)
-                d->pio_mode = pio_mode;
-
         return pio_mode;
 }
 
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 30aeb8750c00..d5c7a57b71c1 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -117,7 +117,7 @@ static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio)
         unsigned long flags;
         int bus_speed = system_bus_clock();
 
-        pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO);
 
         /* calculate timing, according to PIO mode */
         time1 = ide_pio_cycle_time(drive, pio);
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 36a3f0ac6162..8c4c27e5dc10 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -71,7 +71,7 @@ static void tune_dtc2278 (ide_drive_t *drive, u8 pio)
 {
         unsigned long flags;
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
 
         if (pio >= 3) {
                 spin_lock_irqsave(&ide_lock, flags);
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index 85d16812d902..82ed37df9566 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -208,7 +208,7 @@ static u8 ht_pio2timings(ide_drive_t *drive, u8 pio)
         if (pio) {
                 unsigned int cycle_time;
 
-                pio = ide_get_best_pio_mode(drive, pio, 5, NULL);
+                pio = ide_get_best_pio_mode(drive, pio, 5);
                 cycle_time = ide_pio_cycle_time(drive, pio);
 
                 /*
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 233905b08e93..39145102b348 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -258,7 +258,7 @@ static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
         int recovery_time = 415; /* worst case values from the dos driver */
 
         if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
-                pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+                pio = ide_get_best_pio_mode(drive, pio, 4);
                 cycle_time = ide_pio_cycle_time(drive, pio);
 
                 switch (pio) {
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index ddc403a0bd82..caeebd41081f 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -110,7 +110,7 @@ static void tune_umc (ide_drive_t *drive, u8 pio)
         unsigned long flags;
         ide_hwgroup_t *hwgroup = ide_hwifs[HWIF(drive)->index^1].hwgroup;
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
                 drive->name, pio, pio_to_umc[pio]);
         spin_lock_irqsave(&ide_lock, flags);
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 2e7013a2a7f6..b0d13c34d310 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -106,7 +106,7 @@ static void auide_tune_drive(ide_drive_t *drive, byte pio)
         u8 speed;
 
         /* get the best pio mode for the drive */
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
 
         printk(KERN_INFO "%s: setting Au1XXX IDE to PIO mode%d\n",
                drive->name, pio);
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index f8ac91c22e64..8396d711f232 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -142,7 +142,7 @@ static int aec6260_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
 static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) HWIF(drive)->speedproc(drive, pio + XFER_PIO_0);
 }
 
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 1012da6e8a42..a0c43a91b0f3 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -295,7 +295,6 @@ static int ali_get_info (char *buffer, char **addr, off_t offset, int count)
  
 static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio)
 {
-        ide_pio_data_t d;
         ide_hwif_t *hwif = HWIF(drive);
         struct pci_dev *dev = hwif->pci_dev;
         int s_time, a_time, c_time;
@@ -307,7 +306,7 @@ static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio)
         u8 cd_dma_fifo = 0;
         int unit = drive->select.b.unit & 1;
 
-        pio = ide_get_best_pio_mode(drive, pio, 5, &d);
+        pio = ide_get_best_pio_mode(drive, pio, 5);
         s_time = ide_pio_timings[pio].setup_time;
         a_time = ide_pio_timings[pio].active_time;
         if ((s_clc = (s_time * bus_speed + 999) / 1000) >= 8)
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 078adbe250d2..a4740e4776fd 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -155,7 +155,7 @@ static void atiixp_tune_pio(ide_drive_t *drive, u8 pio)
 
 static void atiixp_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         atiixp_tune_pio(drive, pio);
         (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 9f67ffc43421..335482981a92 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -661,7 +661,7 @@ static void cmd640_tune_drive (ide_drive_t *drive, u8 mode_wanted)
                         return;
         }
 
-        mode_wanted = ide_get_best_pio_mode(drive, mode_wanted, 5, NULL);
+        mode_wanted = ide_get_best_pio_mode(drive, mode_wanted, 5);
         cycle_time = ide_pio_cycle_time(drive, mode_wanted);
         cmd640_set_mode(index, mode_wanted, cycle_time);
 
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index c383f6dc67dd..9cf969b61bf2 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -226,7 +226,7 @@ static u8 cmd64x_tune_pio (ide_drive_t *drive, u8 mode_wanted)
         static const u8 setup_values[] = {0x40, 0x40, 0x40, 0x80, 0, 0xc0};
         static const u8 arttim_regs[4] = {ARTTIM0, ARTTIM1, ARTTIM23, ARTTIM23};
 
-        pio_mode = ide_get_best_pio_mode(drive, mode_wanted, 5, NULL);
+        pio_mode = ide_get_best_pio_mode(drive, mode_wanted, 5);
         cycle_time = ide_pio_cycle_time(drive, pio_mode);
 
         cmdprintk("%s: PIO mode wanted %d, selected %d (%d ns)\n",
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index 5539a25eae99..ee10e48d7cef 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -126,7 +126,7 @@ static int cs5520_tune_chipset(ide_drive_t *drive, u8 xferspeed)
         
 static void cs5520_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         cs5520_tune_chipset(drive, (XFER_PIO_0 + pio));
 }
 
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 643d66cc6729..a75c14a93182 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -82,7 +82,7 @@ static void cs5530_tunepio(ide_drive_t *drive, u8 pio)
 
 static void cs5530_tuneproc (ide_drive_t *drive, u8 pio)        /* pio=255 means "autotune" */
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
 
         if (cs5530_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
                 cs5530_tunepio(drive, pio);
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index 503979372144..0bff4005292a 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -89,7 +89,7 @@ static void cs5535_set_speed(ide_drive_t *drive, u8 speed)
 
                 pioa = speed - XFER_PIO_0;
                 piob = ide_get_best_pio_mode(&(drive->hwif->drives[!unit]),
-                                                255, 4, NULL);
+                                                255, 4);
                 cmd = pioa < piob ? pioa : piob;
 
                 /* Write the speed of the current drive */
@@ -159,7 +159,7 @@ static void cs5535_tuneproc(ide_drive_t *drive, u8 xferspeed)
         /* cs5535 max pio is pio 4, best_pio will check the blacklist.
         i think we don't need to rate_filter the incoming xferspeed
         since we know we're only going to choose pio */
-        xferspeed = ide_get_best_pio_mode(drive, xferspeed, 4, NULL);
+        xferspeed = ide_get_best_pio_mode(drive, xferspeed, 4);
         ide_config_drive_speed(drive, modes[xferspeed]);
         cs5535_set_speed(drive, xferspeed);
 }
@@ -174,7 +174,7 @@ static int cs5535_dma_check(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive)) {
-                speed = ide_get_best_pio_mode(drive, 255, 4, NULL);
+                speed = ide_get_best_pio_mode(drive, 255, 4);
                 cs5535_set_drive(drive, speed);
         }
 
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index 995b72563613..cb7c18187e3c 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -330,7 +330,7 @@ static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio)
 #endif /* CY82C693_DEBUG_LOGS */
 
         /* first let's calc the pio modes */
-        pio = ide_get_best_pio_mode(drive, pio, CY82C693_MAX_PIO, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, CY82C693_MAX_PIO);
 
 #if CY82C693_DEBUG_INFO
         printk (KERN_INFO "%s: Selected PIO mode %d\n", drive->name, pio);
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index 6d2ef0ee0f2b..2e4591303f4f 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -80,7 +80,7 @@ static int hpt34x_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
 static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 5, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 5);
         (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio));
 }
 
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 182346a04f36..0a3fe9471eb6 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -652,7 +652,7 @@ static int hpt3xx_tune_chipset(ide_drive_t *drive, u8 speed)
 
 static void hpt3xx_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) hpt3xx_tune_chipset (drive, XFER_PIO_0 + pio);
 }
 
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 684b0ec79f41..d8425a2499bf 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -82,7 +82,7 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio)
                                         { 2, 1 },
                                         { 2, 3 }, };
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
 
         spin_lock_irqsave(&tune_lock, flags);
         pci_read_config_word(dev, master_port, &master_data);
@@ -214,7 +214,7 @@ static int it8213_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        pio = ide_get_best_pio_mode(drive, 255, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, 255, 4);
         it8213_tune_chipset(drive, XFER_PIO_0 + pio);
 
         return -1;
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index faccb2d4af43..790233db017b 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -255,7 +255,7 @@ static int it821x_tunepio(ide_drive_t *drive, u8 set_pio)
          * on the cable.
          */
         if (pair) {
-                u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4, NULL);
+                u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4);
                 /* trim PIO to the slowest of the master/slave */
                 if (pair_pio < set_pio)
                         set_pio = pair_pio;
@@ -276,7 +276,7 @@ static int it821x_tunepio(ide_drive_t *drive, u8 set_pio)
 
 static void it821x_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void)it821x_tunepio(drive, pio);
 }
 
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 0edb9cd45854..57d3d4186b3f 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -97,7 +97,7 @@ static void jmicron_tuneproc (ide_drive_t *drive, byte mode_wanted)
 
 static void config_jmicron_chipset_for_pio (ide_drive_t *drive, byte set_speed)
 {
-        u8 speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5, NULL);
+        u8 speed = XFER_PIO_0 + ide_get_best_pio_mode(drive, 255, 5);
         if (set_speed)
                 (void) ide_config_drive_speed(drive, speed);
 }
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 78d7adf2d0b0..1802ad0927eb 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -147,12 +147,12 @@ static void compute_pios(ide_drive_t *drive, u8 pio)
         int d;
         ide_hwif_t *hwif = HWIF(drive);
 
-        drive->drive_data = ide_get_best_pio_mode(drive, pio, OPTI621_MAX_PIO, NULL);
+        drive->drive_data = ide_get_best_pio_mode(drive, pio, OPTI621_MAX_PIO);
         for (d = 0; d < 2; ++d) {
                 drive = &hwif->drives[d];
                 if (drive->present) {
                         if (drive->drive_data == PIO_DONT_KNOW)
-                                drive->drive_data = ide_get_best_pio_mode(drive, 255, OPTI621_MAX_PIO, NULL);
+                                drive->drive_data = ide_get_best_pio_mode(drive, 255, OPTI621_MAX_PIO);
 #ifdef OPTI621_DEBUG
                         printk("%s: Selected PIO mode %d\n",
                                 drive->name, drive->drive_data);
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index f8508d9cccd3..a8a01b4ab607 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -219,7 +219,7 @@ static int pdcnew_tune_chipset(ide_drive_t *drive, u8 speed)
 
 static void pdcnew_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void)pdcnew_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index eb4e4a61d06e..3a6882d4aa64 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -145,7 +145,7 @@ static int pdc202xx_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
 static void pdc202xx_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         pdc202xx_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index a4f88d25b16d..41a3612c6107 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -219,7 +219,7 @@ static void piix_tune_pio (ide_drive_t *drive, u8 pio)
  */
 static void piix_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         piix_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 9ac8889f8ad3..98e1a2bd9501 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -304,7 +304,7 @@ static void sc1200_tuneproc (ide_drive_t *drive, byte pio)	/* mode=255 means "au
                 return;
         }
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         printk("SC1200: %s: setting PIO mode%d\n", drive->name, pio);
 
         if (sc1200_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index a1954d1c2879..2c76355b92e8 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -210,7 +210,7 @@ static void scc_tuneproc(ide_drive_t *drive, byte mode_wanted)
         unsigned char speed = XFER_PIO_0;
         int offset;
 
-        mode_wanted = ide_get_best_pio_mode(drive, mode_wanted, 4, NULL);
+        mode_wanted = ide_get_best_pio_mode(drive, mode_wanted, 4);
         switch (mode_wanted) {
         case 4:
                 speed = XFER_PIO_4;
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index abc3cd58aaa9..1fe29d9e68fa 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -205,7 +205,7 @@ static int svwks_tune_chipset (ide_drive_t *drive, u8 xferspeed)
 
 static void svwks_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         svwks_tune_pio(drive, pio);
         (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 47b9b94afe05..63a8a93d63d6 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -189,7 +189,7 @@ static void sil_tune_pio(ide_drive_t *drive, u8 pio)
 
         /* trim *taskfile* PIO to the slowest of the master/slave */
         if (pair->present) {
-                u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4, NULL);
+                u8 pair_pio = ide_get_best_pio_mode(pair, 255, 4);
 
                 if (pair_pio < tf_pio)
                         tf_pio = pair_pio;
@@ -221,7 +221,7 @@ static void sil_tune_pio(ide_drive_t *drive, u8 pio)
 
 static void sil_tuneproc(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         sil_tune_pio(drive, pio);
         (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index bbc502087578..3c4693695ca3 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -521,7 +521,7 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
 
 static int sis5513_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         config_art_rwp_pio(drive, pio);
         return ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index cc5f69b7514f..4e8f32e643a6 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -83,7 +83,7 @@ static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
 
         DBG(("sl82c105_tune_pio(drive:%s, pio:%u)\n", drive->name, pio));
 
-        pio = ide_get_best_pio_mode(drive, pio, 5, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 5);
 
         drv_ctrl = get_pio_timings(drive, pio);
 
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 115bcaefc8ee..562747fbee39 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -103,7 +103,7 @@ static void slc90e66_tune_pio (ide_drive_t *drive, u8 pio)
 
 static void slc90e66_tune_drive (ide_drive_t *drive, u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         slc90e66_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 1d40b0820f50..2479a19f0094 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -47,7 +47,7 @@ static int tc86c001_tune_chipset(ide_drive_t *drive, u8 speed)
 
 static void tc86c001_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        pio =  ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) tc86c001_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 801314fe3524..f8fef905bacc 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -96,7 +96,7 @@ static int triflex_tune_chipset(ide_drive_t *drive, u8 xferspeed)
 
 static void triflex_tune_drive(ide_drive_t *drive, u8 pio)
 {
-        int use_pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        int use_pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) triflex_tune_chipset(drive, (XFER_PIO_0 + use_pio));
 }
 
diff --git a/drivers/ide/ppc/mpc8xx.c b/drivers/ide/ppc/mpc8xx.c
index 82de2d781f2e..f3789c0e6cc9 100644
--- a/drivers/ide/ppc/mpc8xx.c
+++ b/drivers/ide/ppc/mpc8xx.c
@@ -431,13 +431,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 669330521fc1..debaa8823f51 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -627,7 +627,7 @@ pmac_ide_tuneproc(ide_drive_t *drive, u8 pio)
         /* which drive is it ? */
         timings = &pmif->timings[drive->select.b.unit & 0x01];
 
-        pio = ide_get_best_pio_mode(drive, pio, 4, NULL);
+        pio = ide_get_best_pio_mode(drive, pio, 4);
         cycle_time = ide_pio_cycle_time(drive, pio);
 
         switch (pmif->kind) {