3 files changed, 8 insertions, 11 deletions

diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 982ac31fa995..922b315da4a0 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -235,11 +235,8 @@ static int atiixp_config_drive_for_dma(ide_drive_t *drive)
 {
         u8 speed = ide_dma_speed(drive, atiixp_ratemask(drive));
 
-        /* If no DMA speed was available then disable DMA and use PIO. */
-        if (!speed) {
-                u8 tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
-                speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
-        }
+        if (!speed)
+                return 0;
 
         (void) atiixp_speedproc(drive, speed);
         return ide_dma_enable(drive);
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index f07bbbed1778..75c2b409908c 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -147,7 +147,9 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 {
         u8 speed        = ide_dma_speed(drive, jmicron_ratemask(drive));
 
-        config_jmicron_chipset_for_pio(drive, !speed);
+        if (!speed)
+                return 0;
+
         jmicron_tune_chipset(drive, speed);
         return ide_dma_enable(drive);
 }
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index b13cce1fd1a6..b0d29cd7123a 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -104,11 +104,9 @@ static int triflex_config_drive_for_dma(ide_drive_t *drive)
 {
         int speed = ide_dma_speed(drive, 0); /* No ultra speeds */
 
-        if (!speed) { 
-                u8 pspeed = ide_get_best_pio_mode(drive, 255, 4, NULL);
-                speed = XFER_PIO_0 + pspeed;
-        }
-        
+        if (!speed)
+                return 0;
+
         (void) triflex_tune_chipset(drive, speed);
          return ide_dma_enable(drive);
 }