amd74xx/via82cxxx: use ide_tune_dma()

* Use ide_tune_dma() in amd74xx/via82cxxx driver, this fixes following bugs:
  - DMA capability bit not being checked on the device
  - DMA blacklist not being checked
  - DMA mode being programmed even if drive->autodma == 0
    (thus possibly destroying PIO timings)

* Bump driver version.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 8 insertions, 22 deletions

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 1088ba86cd1d..513205e52ad2 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -1,5 +1,5 @@
 /*
- * Version 2.21
+ * Version 2.22
  *
  * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04
  * IDE driver for Linux.
@@ -276,18 +276,11 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio)
 
 static int amd74xx_ide_dma_check(ide_drive_t *drive)
 {
-        u8 speed = ide_max_dma_mode(drive);
-
-        if (speed == 0) {
-                ide_set_max_pio(drive);
-                return -1;
-        }
-
-        amd_set_drive(drive, speed);
-
-        if (drive->autodma)
+        if (ide_tune_dma(drive))
                 return 0;
 
+        ide_set_max_pio(drive);
+
         return -1;
 }
 
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 2fc4f8835f19..3611ca6b13b7 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:
  *
@@ -217,18 +217,11 @@ static void via_set_pio_mode(ide_drive_t *drive, const u8 pio)
  
 static int via82cxxx_ide_dma_check (ide_drive_t *drive)
 {
-        u8 speed = ide_max_dma_mode(drive);
-
-        if (speed == 0) {
-                ide_set_max_pio(drive);
-                return -1;
-        }
-
-        via_set_drive(drive, speed);
-
-        if (drive->autodma)
+        if (ide_tune_dma(drive))
                 return 0;
 
+        ide_set_max_pio(drive);
+
         return -1;
 }