1 files changed, 11 insertions, 21 deletions

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index c10203a32159..378feb491ec4 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -1,6 +1,6 @@
 /*
  *
- * Version 3.47
+ * Version 3.48
  *
  * VIA IDE driver for Linux. Supported southbridges:
  *
@@ -158,7 +158,7 @@ static void via_set_speed(ide_hwif_t *hwif, u8 dn, struct ide_timing *timing)
  *      by upper layers.
  */
 
-static int via_set_drive(ide_drive_t *drive, u8 speed)
+static int via_set_drive(ide_drive_t *drive, const u8 speed)
 {
         ide_drive_t *peer = HWIF(drive)->drives + (~drive->dn & 1);
         struct via82cxxx_dev *vdev = pci_get_drvdata(drive->hwif->pci_dev);
@@ -195,19 +195,16 @@ static int via_set_drive(ide_drive_t *drive, 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);
 }
 
 /**
@@ -220,18 +217,11 @@ static void via82cxxx_tune_drive(ide_drive_t *drive, u8 pio)
  
 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);
-                return -1;
-        }
-
-        via_set_drive(drive, speed);
-
-        if (drive->autodma)
+        if (ide_tune_dma(drive))
                 return 0;
 
+        ide_set_max_pio(drive);
+
         return -1;
 }
 
@@ -465,7 +455,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;