ide: add ide_set{_max}_pio() (take 4)

* Add IDE_HFLAG_ABUSE_{PREFETCH,FAST_DEVSEL,DMA_MODES} flags
  and set them in ht6560, cmd640, cmd64x and sc1200 host drivers.

* Add set_pio_mode_abuse() for checking if host driver has a non-standard
  ->tuneproc() implementation and use it in do_special().

* Add ide_set_pio() for setting PIO mode (it uses hwif->pio_mask to find
  the maximum PIO mode supported by the host), also add ide_set_max_pio()
  wrapper for ide_set_pio() to use for auto-tuning.  Convert users of
  ->tuneproc to use ide_set{_max}_pio() where possible.  This leaves only
  do_special(), set_using_pio(), ide_hwif_restore() and ide_set_pio() as
  a direct users of ->tuneproc.

* Remove no longer needed ide_get_best_pio_mode() calls and printk-s
  reporting PIO mode selected from ->tuneproc implementations.

* Rename ->tuneproc hook to ->set_pio_mode and make 'pio' argument const.

* Remove stale comment from ide_config_drive_speed().

v2:
* Fix "ata_" prefix (Noticed by Jeff).

v3:
* Minor cleanups/fixups per Sergei's suggestions.

v4:
* Fix compile problem in drivers/ide/pci/cmd640.c
  (Noticed by Andrew Morton).

* Improve some ->set_pio_mode comments.

Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

30 files changed, 174 insertions, 224 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index a827ea2ab989..0d5f62c5dfae 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -138,9 +138,8 @@ static int aec6260_tune_chipset(ide_drive_t *drive, const u8 speed)
         return(ide_config_drive_speed(drive, speed));
 }
 
-static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
+static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) HWIF(drive)->speedproc(drive, pio + XFER_PIO_0);
 }
 
@@ -150,7 +149,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                aec62xx_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -201,7 +200,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         u8 reg54 = 0,  mask     = hwif->channel ? 0xf0 : 0x0f;
         unsigned long flags;
 
-        hwif->tuneproc = &aec62xx_tune_drive;
+        hwif->set_pio_mode = &aec_set_pio_mode;
 
         if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) {
                 if(hwif->mate)
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 37ecd726aa40..005402ab748b 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -283,17 +283,14 @@ static int ali_get_info (char *buffer, char **addr, off_t offset, int count)
 #endif  /* defined(DISPLAY_ALI_TIMINGS) && defined(CONFIG_IDE_PROC_FS) */
 
 /**
- *      ali15x3_tune_pio        -       set up chipset for PIO mode
- *      @drive: drive to tune
- *      @pio: desired mode
- *
- *      Select the best PIO mode for the drive in question.
- *      Then program the controller for this mode.
+ *      ali_tune_pio    -       set host controller for PIO mode
+ *      @drive: drive
+ *      @pio: PIO mode number
  *
- *      Returns the PIO mode programmed.
+ *      Program the controller for the given PIO mode.
  */
- 
-static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio)
+
+static void ali_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = HWIF(drive);
         struct pci_dev *dev = hwif->pci_dev;
@@ -306,7 +303,6 @@ 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);
         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)
@@ -359,22 +355,20 @@ static u8 ali15x3_tune_pio (ide_drive_t *drive, u8 pio)
          * { 25,   70,     25  },   PIO Mode 4 with IORDY  ns
          * { 20,   50,     30  }    PIO Mode 5 with IORDY (nonstandard)
          */
-
-        return pio;
 }
 
 /**
- *      ali15x3_tune_drive      -       set up drive for PIO mode
+ *      ali_set_pio_mode        -       set up drive for PIO mode
  *      @drive: drive to tune
  *      @pio: desired mode
  *
- *      Program the controller with the best PIO timing for the given drive.
+ *      Program the controller with the desired PIO timing for the given drive.
  *      Then set up the drive itself.
  */
 
-static void ali15x3_tune_drive (ide_drive_t *drive, u8 pio)
+static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ali15x3_tune_pio(drive, pio);
+        ali_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
@@ -437,7 +431,7 @@ static int ali15x3_tune_chipset(ide_drive_t *drive, const u8 speed)
                 pci_write_config_byte(dev, m5229_udma, tmpbyte);
 
                 if (speed < XFER_SW_DMA_0)
-                        (void) ali15x3_tune_pio(drive, speed - XFER_PIO_0);
+                        ali_tune_pio(drive, speed - XFER_PIO_0);
         } else {
                 pci_read_config_byte(dev, m5229_udma, &tmpbyte);
                 tmpbyte &= (0x0f << ((1-unit) << 2));
@@ -470,7 +464,7 @@ static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        ali15x3_tune_drive(drive, 255);
+        ide_set_max_pio(drive);
 
         return -1;
 }
@@ -700,7 +694,7 @@ static u8 __devinit ata66_ali15x3(ide_hwif_t *hwif)
 static void __devinit init_hwif_common_ali15x3 (ide_hwif_t *hwif)
 {
         hwif->autodma = 0;
-        hwif->tuneproc = &ali15x3_tune_drive;
+        hwif->set_pio_mode = &ali_set_pio_mode;
         hwif->speedproc = &ali15x3_tune_chipset;
         hwif->udma_filter = &ali_udma_filter;
 
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 9abbde3c7984..1088ba86cd1d 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -266,16 +266,12 @@ static int amd_set_drive(ide_drive_t *drive, const u8 speed)
 }
 
 /*
- * amd74xx_tune_drive() is a callback from upper layers for
- * PIO-only tuning.
+ * amd_set_pio_mode() is a callback from upper layers for PIO-only tuning.
  */
 
-static void amd74xx_tune_drive(ide_drive_t *drive, u8 pio)
+static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        if (pio == 255)
-                pio = ide_get_best_pio_mode(drive, 255, 5);
-
-        amd_set_drive(drive, XFER_PIO_0 + min_t(byte, pio, 5));
+        amd_set_drive(drive, XFER_PIO_0 + pio);
 }
 
 static int amd74xx_ide_dma_check(ide_drive_t *drive)
@@ -283,7 +279,7 @@ static int amd74xx_ide_dma_check(ide_drive_t *drive)
         u8 speed = ide_max_dma_mode(drive);
 
         if (speed == 0) {
-                amd74xx_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
                 return -1;
         }
 
@@ -409,7 +405,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
 
         hwif->autodma = 0;
 
-        hwif->tuneproc = &amd74xx_tune_drive;
+        hwif->set_pio_mode = &amd_set_pio_mode;
         hwif->speedproc = &amd_set_drive;
 
         for (i = 0; i < 2; i++) {
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index e05e88298500..b9f66f53f9a6 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -153,9 +153,8 @@ static void atiixp_tune_pio(ide_drive_t *drive, u8 pio)
         spin_unlock_irqrestore(&atiixp_lock, flags);
 }
 
-static void atiixp_tuneproc(ide_drive_t *drive, u8 pio)
+static void atiixp_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         atiixp_tune_pio(drive, pio);
         (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -231,7 +230,7 @@ static int atiixp_dma_check(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                atiixp_tuneproc(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -254,7 +253,7 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif)
                 hwif->irq = ch ? 15 : 14;
 
         hwif->autodma = 0;
-        hwif->tuneproc = &atiixp_tuneproc;
+        hwif->set_pio_mode = &atiixp_set_pio_mode;
         hwif->speedproc = &atiixp_speedproc;
         hwif->drives[0].autotune = 1;
         hwif->drives[1].autotune = 1;
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 9689494efa24..f369645e4d16 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -628,45 +628,40 @@ static void cmd640_set_mode (unsigned int index, u8 pio_mode, unsigned int cycle
         program_drive_counts (index);
 }
 
-/*
- * Drive PIO mode selection:
- */
-static void cmd640_tune_drive (ide_drive_t *drive, u8 mode_wanted)
+static void cmd640_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         unsigned int index = 0, cycle_time;
         u8 b;
 
         while (drive != cmd_drives[index]) {
                 if (++index > 3) {
-                        printk("%s: bad news in cmd640_tune_drive\n", drive->name);
+                        printk(KERN_ERR "%s: bad news in %s\n",
+                                        drive->name, __FUNCTION__);
                         return;
                 }
         }
-        switch (mode_wanted) {
+        switch (pio) {
                 case 6: /* set fast-devsel off */
                 case 7: /* set fast-devsel on */
-                        mode_wanted &= 1;
                         b = get_cmd640_reg(CNTRL) & ~0x27;
-                        if (mode_wanted)
+                        if (pio & 1)
                                 b |= 0x27;
                         put_cmd640_reg(CNTRL, b);
-                        printk("%s: %sabled cmd640 fast host timing (devsel)\n", drive->name, mode_wanted ? "en" : "dis");
+                        printk("%s: %sabled cmd640 fast host timing (devsel)\n", drive->name, (pio & 1) ? "en" : "dis");
                         return;
 
                 case 8: /* set prefetch off */
                 case 9: /* set prefetch on */
-                        mode_wanted &= 1;
-                        set_prefetch_mode(index, mode_wanted);
-                        printk("%s: %sabled cmd640 prefetch\n", drive->name, mode_wanted ? "en" : "dis");
+                        set_prefetch_mode(index, pio & 1);
+                        printk("%s: %sabled cmd640 prefetch\n", drive->name, (pio & 1) ? "en" : "dis");
                         return;
         }
 
-        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);
+        cycle_time = ide_pio_cycle_time(drive, pio);
+        cmd640_set_mode(index, pio, cycle_time);
 
         printk("%s: selected cmd640 PIO mode%d (%dns)",
-                drive->name, mode_wanted, cycle_time);
+                drive->name, pio, cycle_time);
 
         display_clocks(index);
 }
@@ -766,8 +761,10 @@ int __init ide_probe_for_cmd640x (void)
                cmd_hwif0->name, 'a' + cmd640_chip_version - 1, bus_type, cfr);
         cmd_hwif0->chipset = ide_cmd640;
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
+        cmd_hwif0->host_flags = IDE_HFLAG_ABUSE_PREFETCH |
+                                IDE_HFLAG_ABUSE_FAST_DEVSEL;
         cmd_hwif0->pio_mask = ATA_PIO5;
-        cmd_hwif0->tuneproc = &cmd640_tune_drive;
+        cmd_hwif0->set_pio_mode = &cmd640_set_pio_mode;
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
 
         /*
@@ -822,8 +819,10 @@ int __init ide_probe_for_cmd640x (void)
                 cmd_hwif1->mate = cmd_hwif0;
                 cmd_hwif1->channel = 1;
 #ifdef CONFIG_BLK_DEV_CMD640_ENHANCED
+                cmd_hwif1->host_flags = IDE_HFLAG_ABUSE_PREFETCH |
+                                        IDE_HFLAG_ABUSE_FAST_DEVSEL;
                 cmd_hwif1->pio_mask = ATA_PIO5;
-                cmd_hwif1->tuneproc = &cmd640_tune_drive;
+                cmd_hwif1->set_pio_mode = &cmd640_set_pio_mode;
 #endif /* CONFIG_BLK_DEV_CMD640_ENHANCED */
         }
         printk(KERN_INFO "%s: %sserialized, secondary interface %s\n", cmd_hwif1->name,
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 5fe50a234ce1..85f5e42eb831 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -214,28 +214,25 @@ static void program_cycle_times (ide_drive_t *drive, int cycle_time, int active_
 }
 
 /*
- * This routine selects drive's best PIO mode and writes into the chipset
- * registers setup/active/recovery timings.
+ * This routine writes into the chipset registers
+ * PIO setup/active/recovery timings.
  */
-static u8 cmd64x_tune_pio (ide_drive_t *drive, u8 mode_wanted)
+static void cmd64x_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
         unsigned int cycle_time;
-        u8 pio_mode, setup_count, arttim = 0;
+        u8 setup_count, arttim = 0;
+
         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);
-        cycle_time = ide_pio_cycle_time(drive, pio_mode);
-
-        cmdprintk("%s: PIO mode wanted %d, selected %d (%d ns)\n",
-                  drive->name, mode_wanted, pio_mode, cycle_time);
+        cycle_time = ide_pio_cycle_time(drive, pio);
 
         program_cycle_times(drive, cycle_time,
-                            ide_pio_timings[pio_mode].active_time);
+                            ide_pio_timings[pio].active_time);
 
-        setup_count = quantize_timing(ide_pio_timings[pio_mode].setup_time,
+        setup_count = quantize_timing(ide_pio_timings[pio].setup_time,
                                       1000 / system_bus_clock());
 
         /*
@@ -266,16 +263,14 @@ static u8 cmd64x_tune_pio (ide_drive_t *drive, u8 mode_wanted)
         arttim |= setup_values[setup_count];
         (void) pci_write_config_byte(dev, arttim_regs[drive->dn], arttim);
         cmdprintk("Write 0x%02x to reg 0x%x\n", arttim, arttim_regs[drive->dn]);
-
-        return pio_mode;
 }
 
 /*
  * Attempts to set drive's PIO mode.
- * Special cases are 8: prefetch off, 9: prefetch on (both never worked),
- * and 255: auto-select best mode (used at boot time).
+ * Special cases are 8: prefetch off, 9: prefetch on (both never worked)
  */
-static void cmd64x_tune_drive (ide_drive_t *drive, u8 pio)
+
+static void cmd64x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         /*
          * Filter out the prefetch control values
@@ -284,7 +279,7 @@ static void cmd64x_tune_drive (ide_drive_t *drive, u8 pio)
         if (pio == 8 || pio == 9)
                 return;
 
-        pio = cmd64x_tune_pio(drive, pio);
+        cmd64x_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
@@ -334,7 +329,7 @@ static int cmd64x_tune_chipset(ide_drive_t *drive, const u8 speed)
         case XFER_PIO_2:
         case XFER_PIO_1:
         case XFER_PIO_0:
-                (void) cmd64x_tune_pio(drive, speed - XFER_PIO_0);
+                cmd64x_tune_pio(drive, speed - XFER_PIO_0);
                 break;
         default:
                 return 1;
@@ -352,7 +347,7 @@ static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                cmd64x_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -536,7 +531,7 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)
 
         pci_read_config_byte(dev, PCI_REVISION_ID, &rev);
 
-        hwif->tuneproc  = &cmd64x_tune_drive;
+        hwif->set_pio_mode = &cmd64x_set_pio_mode;
         hwif->speedproc = &cmd64x_tune_chipset;
 
         hwif->drives[0].autotune = hwif->drives[1].autotune = 1;
@@ -620,6 +615,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x00,0x00,0x00}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x00, /* no udma */
         },{     /* 1 */
@@ -630,6 +626,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x07, /* udma0-2 */
         },{     /* 2 */
@@ -640,6 +637,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x1f, /* udma0-4 */
         },{     /* 3 */
@@ -650,6 +648,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = {
                 .autodma        = AUTODMA,
                 .enablebits     = {{0x51,0x04,0x04}, {0x51,0x08,0x08}},
                 .bootable       = ON_BOARD,
+                .host_flags     = IDE_HFLAG_ABUSE_PREFETCH,
                 .pio_mask       = ATA_PIO5,
                 .udma_mask      = 0x3f, /* udma0-5 */
         }
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index af67438328a8..a73c318ff086 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -122,17 +122,16 @@ static int cs5520_tune_chipset(ide_drive_t *drive, const u8 speed)
 
         return error;
 }       
-        
-static void cs5520_tune_drive(ide_drive_t *drive, u8 pio)
+
+static void cs5520_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
-        cs5520_tune_chipset(drive, (XFER_PIO_0 + pio));
+        cs5520_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
 static int cs5520_config_drive_xfer_rate(ide_drive_t *drive)
 {
         /* Tune the drive for PIO modes up to PIO 4 */  
-        cs5520_tune_drive(drive, 255);
+        ide_set_max_pio(drive);
 
         /* Then tell the core to use DMA operations */
         return 0;
@@ -164,7 +163,7 @@ static int cs5520_dma_on(ide_drive_t *drive)
 
 static void __devinit init_hwif_cs5520(ide_hwif_t *hwif)
 {
-        hwif->tuneproc = &cs5520_tune_drive;
+        hwif->set_pio_mode = &cs5520_set_pio_mode;
         hwif->speedproc = &cs5520_tune_chipset;
         hwif->ide_dma_check = &cs5520_config_drive_xfer_rate;
         hwif->ide_dma_on = &cs5520_dma_on;
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 518f430c1529..1588a323c5d0 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -71,19 +71,18 @@ static void cs5530_tunepio(ide_drive_t *drive, u8 pio)
 }
 
 /**
- *      cs5530_tuneproc         -       select/set PIO modes
+ *      cs5530_set_pio_mode     -       set PIO mode
+ *      @drive: drive
+ *      @pio: PIO mode number
  *
- *      cs5530_tuneproc() handles selection/setting of PIO modes
- *      for both the chipset and drive.
+ *      Handles setting of PIO mode for both the chipset and drive.
  *
- *      The ide_init_cs5530() routine guarantees that all drives
+ *      The init_hwif_cs5530() routine guarantees that all drives
  *      will have valid default PIO timings set up before we get here.
  */
 
-static void cs5530_tuneproc (ide_drive_t *drive, u8 pio)        /* pio=255 means "autotune" */
+static void cs5530_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
-
         if (cs5530_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
                 cs5530_tunepio(drive, pio);
 }
@@ -306,7 +305,7 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
         if (hwif->mate)
                 hwif->serialized = hwif->mate->serialized = 1;
 
-        hwif->tuneproc = &cs5530_tuneproc;
+        hwif->set_pio_mode = &cs5530_set_pio_mode;
         hwif->speedproc = &cs5530_tune_chipset;
 
         basereg = CS5530_BASEREG(hwif);
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index bc00e7b62151..383b7eccbcbb 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -147,16 +147,16 @@ static int cs5535_set_drive(ide_drive_t *drive, u8 speed)
         return 0;
 }
 
-/****
- *      cs5535_tuneproc    -       PIO setup
- *      @drive: drive to set up
- *      @pio: mode to use (255 for 'best possible')
+/**
+ *      cs5535_set_pio_mode     -       PIO setup
+ *      @drive: drive
+ *      @pio: PIO mode number
  *
  *      A callback from the upper layers for PIO-only tuning.
  */
-static void cs5535_tuneproc(ide_drive_t *drive, u8 pio)
+
+static void cs5535_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         ide_config_drive_speed(drive, XFER_PIO_0 + pio);
         cs5535_set_speed(drive, XFER_PIO_0 + pio);
 }
@@ -169,7 +169,7 @@ static int cs5535_dma_check(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                cs5535_tuneproc(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -198,7 +198,7 @@ static void __devinit init_hwif_cs5535(ide_hwif_t *hwif)
 
         hwif->autodma = 0;
 
-        hwif->tuneproc = &cs5535_tuneproc;
+        hwif->set_pio_mode = &cs5535_set_pio_mode;
         hwif->speedproc = &cs5535_set_drive;
         hwif->ide_dma_check = &cs5535_dma_check;
 
diff --git a/drivers/ide/pci/cy82c693.c b/drivers/ide/pci/cy82c693.c
index daa36fcbc8ef..dc278025d318 100644
--- a/drivers/ide/pci/cy82c693.c
+++ b/drivers/ide/pci/cy82c693.c
@@ -97,9 +97,6 @@
 #define CY82_INDEX_CHANNEL1     0x31
 #define CY82_INDEX_TIMEOUT      0x32
 
-/* the max PIO mode - from datasheet */
-#define CY82C693_MAX_PIO        4
-
 /* the min and max PCI bus speed in MHz - from datasheet */
 #define CY82C963_MIN_BUS_SPEED  25
 #define CY82C963_MAX_BUS_SPEED  33
@@ -148,9 +145,6 @@ static void compute_clocks (u8 pio, pio_clocks_t *p_pclk)
          * so you can play with the idebus=xx parameter
          */
 
-        if (pio > CY82C693_MAX_PIO)
-                pio = CY82C693_MAX_PIO;
-
         /* let's calc the address setup time clocks */
         p_pclk->address_time = (u8)calc_clk(ide_pio_timings[pio].setup_time, bus_speed);
 
@@ -269,10 +263,7 @@ static int cy82c693_ide_dma_on (ide_drive_t *drive)
         return __ide_dma_on(drive);
 }
 
-/*
- * tune ide drive - set PIO mode
- */
-static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio)
+static void cy82c693_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t *hwif = HWIF(drive);
         struct pci_dev *dev = hwif->pci_dev;
@@ -329,13 +320,6 @@ static void cy82c693_tune_drive (ide_drive_t *drive, u8 pio)
                 addrCtrl, pclk.time_16r, pclk.time_16w, pclk.time_8);
 #endif /* CY82C693_DEBUG_LOGS */
 
-        /* first let's calc the pio modes */
-        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);
-#endif /* CY82C693_DEBUG_INFO */
-
         /* let's calc the values for this PIO mode */
         compute_clocks(pio, &pclk);
 
@@ -447,7 +431,7 @@ static void __devinit init_hwif_cy82c693(ide_hwif_t *hwif)
         hwif->autodma = 0;
 
         hwif->chipset = ide_cy82c693;
-        hwif->tuneproc = &cy82c693_tune_drive;
+        hwif->set_pio_mode = &cy82c693_set_pio_mode;
 
         if (!hwif->dma_base) {
                 hwif->drives[0].autotune = 1;
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index ba982d66ff73..a1bb10188fe5 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -77,9 +77,8 @@ static int hpt34x_tune_chipset(ide_drive_t *drive, const u8 speed)
         return(ide_config_drive_speed(drive, speed));
 }
 
-static void hpt34x_tune_drive (ide_drive_t *drive, u8 pio)
+static void hpt34x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 5);
         (void) hpt34x_tune_chipset(drive, (XFER_PIO_0 + pio));
 }
 
@@ -91,7 +90,7 @@ static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
                 return -1;
 
         if (ide_use_fast_pio(drive))
-                hpt34x_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -145,7 +144,7 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif)
 
         hwif->autodma = 0;
 
-        hwif->tuneproc = &hpt34x_tune_drive;
+        hwif->set_pio_mode = &hpt34x_set_pio_mode;
         hwif->speedproc = &hpt34x_tune_chipset;
         hwif->drives[0].autotune = 1;
         hwif->drives[1].autotune = 1;
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 67127ac3a14a..0e7d3b60d43c 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -662,9 +662,8 @@ static int hpt3xx_tune_chipset(ide_drive_t *drive, u8 speed)
                 return hpt36x_tune_chipset(drive, speed);
 }
 
-static void hpt3xx_tune_drive(ide_drive_t *drive, u8 pio)
+static void hpt3xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) hpt3xx_tune_chipset (drive, XFER_PIO_0 + pio);
 }
 
@@ -726,7 +725,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                hpt3xx_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -1257,7 +1256,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         /* Cache the channel's MISC. control registers' offset */
         hwif->select_data       = hwif->channel ? 0x54 : 0x50;
 
-        hwif->tuneproc          = &hpt3xx_tune_drive;
+        hwif->set_pio_mode      = &hpt3xx_set_pio_mode;
         hwif->speedproc         = &hpt3xx_tune_chipset;
         hwif->quirkproc         = &hpt3xx_quirkproc;
         hwif->intrproc          = &hpt3xx_intrproc;
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 6fa955749aec..d07771e06b2d 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -105,9 +105,8 @@ static void it8213_tune_pio(ide_drive_t *drive, const u8 pio)
         spin_unlock_irqrestore(&tune_lock, flags);
 }
 
-static void it8213_tuneproc(ide_drive_t *drive, u8 pio)
+static void it8213_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         it8213_tune_pio(drive, pio);
         ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -212,7 +211,7 @@ static int it8213_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        it8213_tuneproc(drive, 255);
+        ide_set_max_pio(drive);
 
         return -1;
 }
@@ -231,7 +230,7 @@ static void __devinit init_hwif_it8213(ide_hwif_t *hwif)
         u8 reg42h = 0;
 
         hwif->speedproc = &it8213_tune_chipset;
-        hwif->tuneproc  = &it8213_tuneproc;
+        hwif->set_pio_mode = &it8213_set_pio_mode;
 
         hwif->autodma = 0;
 
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index a756e61bcb32..0cce4a7f5e46 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -274,9 +274,8 @@ static int it821x_tunepio(ide_drive_t *drive, u8 set_pio)
         return ide_config_drive_speed(drive, XFER_PIO_0 + set_pio);
 }
 
-static void it821x_tuneproc(ide_drive_t *drive, u8 pio)
+static void it821x_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void)it821x_tunepio(drive, pio);
 }
 
@@ -473,7 +472,7 @@ static int it821x_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        it821x_tuneproc(drive, 255);
+        ide_set_max_pio(drive);
 
         return -1;
 }
@@ -640,7 +639,7 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif)
         }
 
         hwif->speedproc = &it821x_tune_chipset;
-        hwif->tuneproc  = &it821x_tuneproc;
+        hwif->set_pio_mode = &it821x_set_pio_mode;
 
         /* MWDMA/PIO clock switching for pass through mode */
         if(!idev->smart) {
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 7bac87fb481a..d379fbaf6743 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -83,9 +83,8 @@ static u8 __devinit ata66_jmicron(ide_hwif_t *hwif)
         return ATA_CBL_PATA80;
 }
 
-static void jmicron_tuneproc(ide_drive_t *drive, u8 pio)
+static void jmicron_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 5);
         ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
@@ -116,7 +115,7 @@ static int jmicron_config_drive_for_dma (ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        jmicron_tuneproc(drive, 255);
+        ide_set_max_pio(drive);
 
         return -1;
 }
@@ -131,7 +130,7 @@ static int jmicron_config_drive_for_dma (ide_drive_t *drive)
 static void __devinit init_hwif_jmicron(ide_hwif_t *hwif)
 {
         hwif->speedproc = &jmicron_tune_chipset;
-        hwif->tuneproc  = &jmicron_tuneproc;
+        hwif->set_pio_mode = &jmicron_set_pio_mode;
 
         hwif->drives[0].autotune = 1;
         hwif->drives[1].autotune = 1;
diff --git a/drivers/ide/pci/opti621.c b/drivers/ide/pci/opti621.c
index 3a2bb2723515..9fa06393469a 100644
--- a/drivers/ide/pci/opti621.c
+++ b/drivers/ide/pci/opti621.c
@@ -47,7 +47,7 @@
  * The main problem with OPTi is that some timings for master
  * and slave must be the same. For example, if you have master
  * PIO 3 and slave PIO 0, driver have to set some timings of
- * master for PIO 0. Second problem is that opti621_tune_drive
+ * master for PIO 0. Second problem is that opti621_set_pio_mode
  * got only one drive to set, but have to set both drives.
  * This is solved in compute_pios. If you don't set
  * the second drive, compute_pios use ide_get_best_pio_mode
@@ -103,7 +103,7 @@
 
 #include <asm/io.h>
 
-#define OPTI621_MAX_PIO 3
+//#define OPTI621_MAX_PIO 3
 /* In fact, I do not have any PIO 4 drive
  * (address: 25 ns, data: 70 ns, recovery: 35 ns),
  * but OPTi 82C621 is programmable and it can do (minimal values):
@@ -136,8 +136,8 @@ static int reg_base;
 #define PIO_NOT_EXIST 254
 #define PIO_DONT_KNOW 255
 
-/* there are stored pio numbers from other calls of opti621_tune_drive */
-static void compute_pios(ide_drive_t *drive, u8 pio)
+/* there are stored pio numbers from other calls of opti621_set_pio_mode */
+static void compute_pios(ide_drive_t *drive, const u8 pio)
 /* Store values into drive->drive_data
  *      second_contr - 0 for primary controller, 1 for secondary
  *      slave_drive - 0 -> pio is for master, 1 -> pio is for slave
@@ -147,12 +147,13 @@ 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);
+        drive->drive_data = 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);
+                                drive->drive_data = ide_get_best_pio_mode(drive, 255, 3);
 #ifdef OPTI621_DEBUG
                         printk("%s: Selected PIO mode %d\n",
                                 drive->name, drive->drive_data);
@@ -240,8 +241,7 @@ static void compute_clocks(int pio, pio_clocks_t *clks)
  
 }
 
-/* Main tune procedure, called from tuneproc. */
-static void opti621_tune_drive (ide_drive_t *drive, u8 pio)
+static void opti621_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         /* primary and secondary drives share some registers,
          * so we have to program both drives
@@ -331,7 +331,8 @@ static void __devinit init_hwif_opti621 (ide_hwif_t *hwif)
         hwif->autodma = 0;
         hwif->drives[0].drive_data = PIO_DONT_KNOW;
         hwif->drives[1].drive_data = PIO_DONT_KNOW;
-        hwif->tuneproc = &opti621_tune_drive;
+
+        hwif->set_pio_mode = &opti621_set_pio_mode;
 
         if (!(hwif->dma_base))
                 return;
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index 3787194a2249..5fb1eedc8194 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -215,9 +215,8 @@ static int pdcnew_tune_chipset(ide_drive_t *drive, const u8 speed)
         return err;
 }
 
-static void pdcnew_tune_drive(ide_drive_t *drive, u8 pio)
+static void pdcnew_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void)pdcnew_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
@@ -237,7 +236,7 @@ static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                pdcnew_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -490,7 +489,8 @@ static void __devinit init_hwif_pdc202new(ide_hwif_t *hwif)
 {
         hwif->autodma = 0;
 
-        hwif->tuneproc  = &pdcnew_tune_drive;
+        hwif->set_pio_mode = &pdcnew_set_pio_mode;
+
         hwif->quirkproc = &pdcnew_quirkproc;
         hwif->speedproc = &pdcnew_tune_chipset;
         hwif->resetproc = &pdcnew_reset;
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index e7a5e3014c09..b578307fad51 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -142,9 +142,8 @@ static int pdc202xx_tune_chipset(ide_drive_t *drive, const u8 speed)
         return ide_config_drive_speed(drive, speed);
 }
 
-static void pdc202xx_tune_drive(ide_drive_t *drive, u8 pio)
+static void pdc202xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         pdc202xx_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
@@ -190,7 +189,7 @@ static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                pdc202xx_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -306,10 +305,11 @@ static void pdc202xx_reset (ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         ide_hwif_t *mate        = hwif->mate;
-        
+
         pdc202xx_reset_host(hwif);
         pdc202xx_reset_host(mate);
-        pdc202xx_tune_drive(drive, 255);
+
+        ide_set_max_pio(drive);
 }
 
 static unsigned int __devinit init_chipset_pdc202xx(struct pci_dev *dev,
@@ -328,7 +328,9 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
                 hwif->rqsize = 256;
 
         hwif->autodma = 0;
-        hwif->tuneproc  = &pdc202xx_tune_drive;
+
+        hwif->set_pio_mode = &pdc202xx_set_pio_mode;
+
         hwif->quirkproc = &pdc202xx_quirkproc;
 
         if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246)
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index b66f9d1411b3..07492d71c602 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -17,11 +17,11 @@
  *                 41
  *                 43
  *
- * | PIO 0       | c0 | 80 | 0 |        piix_tune_drive(drive, 0);
- * | PIO 2 | SW2 | d0 | 90 | 4 |        piix_tune_drive(drive, 2);
- * | PIO 3 | MW1 | e1 | a1 | 9 |        piix_tune_drive(drive, 3);
- * | PIO 4 | MW2 | e3 | a3 | b |        piix_tune_drive(drive, 4);
- * 
+ * | PIO 0       | c0 | 80 | 0 |
+ * | PIO 2 | SW2 | d0 | 90 | 4 |
+ * | PIO 3 | MW1 | e1 | a1 | 9 |
+ * | PIO 4 | MW2 | e3 | a3 | b |
+ *
  * sitre = word40 & 0x4000; primary
  * sitre = word42 & 0x4000; secondary
  *
@@ -204,16 +204,16 @@ static void piix_tune_pio (ide_drive_t *drive, u8 pio)
 }
 
 /**
- *      piix_tune_drive         -       tune a drive attached to PIIX
+ *      piix_set_pio_mode       -       set PIO mode
  *      @drive: drive to tune
  *      @pio: desired PIO mode
  *
  *      Set the drive's PIO mode (might be useful if drive is not registered
  *      in CMOS for any reason).
  */
-static void piix_tune_drive (ide_drive_t *drive, u8 pio)
+
+static void piix_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         piix_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -317,7 +317,7 @@ static int piix_config_drive_xfer_rate (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                piix_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -454,7 +454,8 @@ static void __devinit init_hwif_piix(ide_hwif_t *hwif)
         }
 
         hwif->autodma = 0;
-        hwif->tuneproc = &piix_tune_drive;
+
+        hwif->set_pio_mode = &piix_set_pio_mode;
         hwif->speedproc = &piix_tune_chipset;
         hwif->drives[0].autotune = 1;
         hwif->drives[1].autotune = 1;
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 059071cd2d49..f9f5ed906577 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -272,19 +272,20 @@ static int sc1200_ide_dma_end (ide_drive_t *drive)
 }
 
 /*
- * sc1200_tuneproc() handles selection/setting of PIO modes
+ * sc1200_set_pio_mode() handles setting of PIO modes
  * for both the chipset and drive.
  *
  * All existing BIOSs for this chipset guarantee that all drives
  * will have valid default PIO timings set up before we get here.
  */
-static void sc1200_tuneproc (ide_drive_t *drive, byte pio)      /* mode=255 means "autotune" */
+
+static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         ide_hwif_t      *hwif = HWIF(drive);
         int             mode = -1;
 
         /*
-         * bad abuse of ->tuneproc interface
+         * bad abuse of ->set_pio_mode interface
          */
         switch (pio) {
                 case 200: mode = XFER_UDMA_0;   break;
@@ -302,9 +303,6 @@ static void sc1200_tuneproc (ide_drive_t *drive, byte pio)	/* mode=255 means "au
                 return;
         }
 
-        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)
                 sc1200_tunepio(drive, pio);
 }
@@ -420,7 +418,8 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
                 hwif->ide_dma_end   = &sc1200_ide_dma_end;
                 if (!noautodma)
                         hwif->autodma = 1;
-                hwif->tuneproc = &sc1200_tuneproc;
+
+                hwif->set_pio_mode = &sc1200_set_pio_mode;
                 hwif->speedproc = &sc1200_tune_chipset;
         }
         hwif->atapi_dma = 1;
@@ -436,6 +435,7 @@ static ide_pci_device_t sc1200_chipset __devinitdata = {
         .init_hwif      = init_hwif_sc1200,
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
+        .host_flags     = IDE_HFLAG_ABUSE_DMA_MODES,
         .pio_mask       = ATA_PIO4,
 };
 
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index a19687caf65a..3505d57eda18 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -221,9 +221,8 @@ static void scc_tune_pio(ide_drive_t *drive, const u8 pio)
         out_be32((void __iomem *)pioct_port, reg);
 }
 
-static void scc_tuneproc(ide_drive_t *drive, u8 pio)
+static void scc_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         scc_tune_pio(drive, pio);
         ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -316,7 +315,7 @@ static int scc_config_drive_for_dma(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                scc_tuneproc(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -717,7 +716,7 @@ static void __devinit init_hwif_scc(ide_hwif_t *hwif)
         hwif->dma_setup = scc_dma_setup;
         hwif->ide_dma_end = scc_ide_dma_end;
         hwif->speedproc = scc_tune_chipset;
-        hwif->tuneproc = scc_tuneproc;
+        hwif->set_pio_mode = scc_set_pio_mode;
         hwif->ide_dma_check = scc_config_drive_for_dma;
         hwif->ide_dma_test_irq = scc_dma_test_irq;
         hwif->udma_filter = scc_udma_filter;
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index b51133bb58af..f4e08abf0fee 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -202,9 +202,8 @@ static int svwks_tune_chipset(ide_drive_t *drive, const u8 speed)
         return (ide_config_drive_speed(drive, speed));
 }
 
-static void svwks_tune_drive (ide_drive_t *drive, u8 pio)
+static void svwks_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         svwks_tune_pio(drive, pio);
         (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -217,7 +216,7 @@ static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                svwks_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -389,7 +388,7 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif)
         if (!hwif->irq)
                 hwif->irq = hwif->channel ? 15 : 14;
 
-        hwif->tuneproc = &svwks_tune_drive;
+        hwif->set_pio_mode = &svwks_set_pio_mode;
         hwif->speedproc = &svwks_tune_chipset;
         hwif->udma_filter = &svwks_udma_filter;
 
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 57145767c3df..38f63d19c3b9 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -587,7 +587,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->mwdma_mask = 0x2; /* Multimode-2 DMA  */
         hwif->swdma_mask = 0x2;
         hwif->pio_mask = 0x00;
-        hwif->tuneproc = NULL;  /* Sets timing for PIO mode */
+        hwif->set_pio_mode = NULL; /* Sets timing for PIO mode */
         hwif->speedproc = NULL; /* Sets timing for DMA &/or PIO modes */
         hwif->selectproc = NULL;/* Use the default routine to select drive */
         hwif->reset_poll = NULL;/* No HBA specific reset_poll needed */
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 4c1f3bc7e179..e07c991d91b9 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -219,9 +219,8 @@ static void sil_tune_pio(ide_drive_t *drive, u8 pio)
         }
 }
 
-static void sil_tuneproc(ide_drive_t *drive, u8 pio)
+static void sil_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         sil_tune_pio(drive, pio);
         (void)ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -328,7 +327,7 @@ static int siimage_config_drive_for_dma (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                sil_tuneproc(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -899,7 +898,7 @@ static void __devinit init_hwif_siimage(ide_hwif_t *hwif)
         
         hwif->resetproc = &siimage_reset;
         hwif->speedproc = &siimage_tune_chipset;
-        hwif->tuneproc  = &sil_tuneproc;
+        hwif->set_pio_mode = &sil_set_pio_mode;
         hwif->reset_poll = &siimage_reset_poll;
         hwif->pre_reset = &siimage_pre_reset;
         hwif->udma_filter = &sil_udma_filter;
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index fed582b4b32f..7455bf357ed9 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -519,14 +519,13 @@ static void config_art_rwp_pio (ide_drive_t *drive, u8 pio)
         }
 }
 
-static int sis5513_tune_drive(ide_drive_t *drive, u8 pio)
+static int sis5513_tune_drive(ide_drive_t *drive, const u8 pio)
 {
-        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);
 }
 
-static void sis5513_tuneproc(ide_drive_t *drive, u8 pio)
+static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
         (void)sis5513_tune_drive(drive, pio);
 }
@@ -621,7 +620,7 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive)
         /*
          * TODO: always set PIO mode and remove this
          */
-        sis5513_tuneproc(drive, 255);
+        ide_set_max_pio(drive);
 
         drive->init_speed = 0;
 
@@ -629,7 +628,7 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                sis5513_tuneproc(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -852,7 +851,7 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif)
         if (!hwif->irq)
                 hwif->irq = hwif->channel ? 15 : 14;
 
-        hwif->tuneproc = &sis5513_tuneproc;
+        hwif->set_pio_mode = &sis_set_pio_mode;
         hwif->speedproc = &sis5513_tune_chipset;
 
         if (chipset_family >= ATA_133)
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 9f425b0b5721..131e91ca1d82 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -75,16 +75,12 @@ static unsigned int get_pio_timings(ide_drive_t *drive, u8 pio)
 /*
  * Configure the chipset for PIO mode.
  */
-static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
+static void sl82c105_tune_pio(ide_drive_t *drive, const u8 pio)
 {
         struct pci_dev *dev     = HWIF(drive)->pci_dev;
         int reg                 = 0x44 + drive->dn * 4;
         u16 drv_ctrl;
 
-        DBG(("sl82c105_tune_pio(drive:%s, pio:%u)\n", drive->name, pio));
-
-        pio = ide_get_best_pio_mode(drive, pio, 5);
-
         drv_ctrl = get_pio_timings(drive, pio);
 
         /*
@@ -106,8 +102,6 @@ static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
         printk(KERN_DEBUG "%s: selected %s (%dns) (%04X)\n", drive->name,
                           ide_xfer_verbose(pio + XFER_PIO_0),
                           ide_pio_cycle_time(drive, pio), drv_ctrl);
-
-        return pio;
 }
 
 /*
@@ -151,7 +145,7 @@ static int sl82c105_tune_chipset(ide_drive_t *drive, const u8 speed)
         case XFER_PIO_2:
         case XFER_PIO_1:
         case XFER_PIO_0:
-                (void) sl82c105_tune_pio(drive, speed - XFER_PIO_0);
+                sl82c105_tune_pio(drive, speed - XFER_PIO_0);
                 break;
         default:
                 return -1;
@@ -325,11 +319,10 @@ static void sl82c105_resetproc(ide_drive_t *drive)
  * We only deal with PIO mode here - DMA mode 'using_dma' is not
  * initialised at the point that this function is called.
  */
-static void sl82c105_tune_drive(ide_drive_t *drive, u8 pio)
+static void sl82c105_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        DBG(("sl82c105_tune_drive(drive:%s, pio:%u)\n", drive->name, pio));
+        sl82c105_tune_pio(drive, pio);
 
-        pio = sl82c105_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
 
@@ -397,7 +390,7 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
 
         DBG(("init_hwif_sl82c105(hwif: ide%d)\n", hwif->index));
 
-        hwif->tuneproc          = &sl82c105_tune_drive;
+        hwif->set_pio_mode      = &sl82c105_set_pio_mode;
         hwif->speedproc         = &sl82c105_tune_chipset;
         hwif->selectproc        = &sl82c105_selectproc;
         hwif->resetproc         = &sl82c105_resetproc;
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index cc9353565070..214d396fc31f 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -95,9 +95,8 @@ static void slc90e66_tune_pio (ide_drive_t *drive, u8 pio)
         spin_unlock_irqrestore(&ide_lock, flags);
 }
 
-static void slc90e66_tune_drive (ide_drive_t *drive, u8 pio)
+static void slc90e66_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         slc90e66_tune_pio(drive, pio);
         (void) ide_config_drive_speed(drive, XFER_PIO_0 + pio);
 }
@@ -166,7 +165,7 @@ static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                slc90e66_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -182,7 +181,7 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
                 hwif->irq = hwif->channel ? 15 : 14;
 
         hwif->speedproc = &slc90e66_tune_chipset;
-        hwif->tuneproc  = &slc90e66_tune_drive;
+        hwif->set_pio_mode = &slc90e66_set_pio_mode;
 
         pci_read_config_byte(hwif->pci_dev, 0x47, &reg47);
 
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index e5425772622f..e23b9cfb6eb4 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -43,9 +43,8 @@ static int tc86c001_tune_chipset(ide_drive_t *drive, const u8 speed)
         return ide_config_drive_speed(drive, speed);
 }
 
-static void tc86c001_tune_drive(ide_drive_t *drive, u8 pio)
+static void tc86c001_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        pio = ide_get_best_pio_mode(drive, pio, 4);
         (void) tc86c001_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
@@ -171,7 +170,7 @@ static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
                 return 0;
 
         if (ide_use_fast_pio(drive))
-                tc86c001_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
 
         return -1;
 }
@@ -193,7 +192,7 @@ static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
         /* Store the system control register base for convenience... */
         hwif->config_data = sc_base;
 
-        hwif->tuneproc  = &tc86c001_tune_drive;
+        hwif->set_pio_mode = &tc86c001_set_pio_mode;
         hwif->speedproc = &tc86c001_tune_chipset;
         hwif->busproc   = &tc86c001_busproc;
 
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 47cf89be4dfc..c3ff066eea5a 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -93,10 +93,9 @@ static int triflex_tune_chipset(ide_drive_t *drive, const u8 speed)
         return (ide_config_drive_speed(drive, speed));
 }
 
-static void triflex_tune_drive(ide_drive_t *drive, u8 pio)
+static void triflex_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        int use_pio = ide_get_best_pio_mode(drive, pio, 4);
-        (void) triflex_tune_chipset(drive, (XFER_PIO_0 + use_pio));
+        (void)triflex_tune_chipset(drive, XFER_PIO_0 + pio);
 }
 
 static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
@@ -104,14 +103,14 @@ static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
         if (ide_tune_dma(drive))
                 return 0;
 
-        triflex_tune_drive(drive, 255);
+        ide_set_max_pio(drive);
 
         return -1;
 }
 
 static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
 {
-        hwif->tuneproc = &triflex_tune_drive;
+        hwif->set_pio_mode = &triflex_set_pio_mode;
         hwif->speedproc = &triflex_tune_chipset;
 
         if (hwif->dma_base == 0)
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index e3bf90736332..2fc4f8835f19 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -195,19 +195,16 @@ static int via_set_drive(ide_drive_t *drive, const u8 speed)
 }
 
 /**
- *      via82cxxx_tune_drive    -       PIO setup
- *      @drive: drive to set up
- *      @pio: mode to use (255 for 'best possible')
+ *      via_set_pio_mode        -       PIO setup
+ *      @drive: drive
+ *      @pio: PIO mode number
  *
  *      A callback from the upper layers for PIO-only tuning.
  */
 
-static void via82cxxx_tune_drive(ide_drive_t *drive, u8 pio)
+static void via_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        if (pio == 255)
-                pio = ide_get_best_pio_mode(drive, 255, 5);
-
-        via_set_drive(drive, XFER_PIO_0 + min_t(u8, pio, 5));
+        via_set_drive(drive, XFER_PIO_0 + pio);
 }
 
 /**
@@ -223,7 +220,7 @@ static int via82cxxx_ide_dma_check (ide_drive_t *drive)
         u8 speed = ide_max_dma_mode(drive);
 
         if (speed == 0) {
-                via82cxxx_tune_drive(drive, 255);
+                ide_set_max_pio(drive);
                 return -1;
         }
 
@@ -465,7 +462,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
 
         hwif->autodma = 0;
 
-        hwif->tuneproc = &via82cxxx_tune_drive;
+        hwif->set_pio_mode = &via_set_pio_mode;
         hwif->speedproc = &via_set_drive;