36 files changed, 120 insertions, 139 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 61ce40d52f5f..aeed0205ce64 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -365,10 +365,7 @@ static int icside_dma_check(ide_drive_t *drive)
 out:
         on = icside_set_speed(drive, xfer_mode);
 
-        if (on)
-                return icside_dma_on(drive);
-        else
-                return icside_dma_off_quietly(drive);
+        return on ? 0 : -1;
 }
 
 static int icside_dma_end(ide_drive_t *drive)
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c
index 24281176b4dc..027341d66b28 100644
--- a/drivers/ide/cris/ide-cris.c
+++ b/drivers/ide/cris/ide-cris.c
@@ -1048,12 +1048,10 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive)
 
 static int cris_dma_check(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = drive->hwif;
-
         if (ide_use_dma(drive) && cris_config_drive_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int cris_dma_end(ide_drive_t *drive)
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index 1a288e5307d3..4fbcea4c1025 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -348,15 +348,14 @@ EXPORT_SYMBOL_GPL(ide_destroy_dmatable);
 static int config_drive_for_dma (ide_drive_t *drive)
 {
         struct hd_driveid *id = drive->id;
-        ide_hwif_t *hwif = HWIF(drive);
 
-        if ((id->capability & 1) && hwif->autodma) {
+        if ((id->capability & 1) && drive->hwif->autodma) {
                 /*
                  * Enable DMA on any drive that has
                  * UltraDMA (mode 0/1/2/3/4/5/6) enabled
                  */
                 if ((id->field_valid & 4) && ((id->dma_ultra >> 8) & 0x7f))
-                        return hwif->ide_dma_on(drive);
+                        return 0;
                 /*
                  * Enable DMA on any drive that has mode2 DMA
                  * (multi or single) enabled
@@ -364,14 +363,14 @@ static int config_drive_for_dma (ide_drive_t *drive)
                 if (id->field_valid & 2)        /* regular DMA */
                         if ((id->dma_mword & 0x404) == 0x404 ||
                             (id->dma_1word & 0x404) == 0x404)
-                                return hwif->ide_dma_on(drive);
+                                return 0;
 
                 /* Consult the list of known "good" drives */
                 if (__ide_dma_good_drive(drive))
-                        return hwif->ide_dma_on(drive);
+                        return 0;
         }
-//      if (hwif->tuneproc != NULL) hwif->tuneproc(drive, 255);
-        return hwif->ide_dma_off_quietly(drive);
+
+        return -1;
 }
 
 /**
@@ -765,6 +764,30 @@ bug_dma_off:
 
 EXPORT_SYMBOL(ide_dma_verbose);
 
+int ide_set_dma(ide_drive_t *drive)
+{
+        ide_hwif_t *hwif = drive->hwif;
+        int rc;
+
+        rc = hwif->ide_dma_check(drive);
+
+        switch(rc) {
+        case -1: /* DMA needs to be disabled */
+                return hwif->ide_dma_off_quietly(drive);
+        case  0: /* DMA needs to be enabled */
+                return hwif->ide_dma_on(drive);
+        case  1: /* DMA setting cannot be changed */
+                break;
+        default:
+                BUG();
+                break;
+        }
+
+        return rc;
+}
+
+EXPORT_SYMBOL_GPL(ide_set_dma);
+
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 int __ide_dma_lostirq (ide_drive_t *drive)
 {
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 99d1c43f433e..9f45a84588d9 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -226,7 +226,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
                         break;
                 if (drive->hwif->ide_dma_check == NULL)
                         break;
-                drive->hwif->ide_dma_check(drive);
+                ide_set_dma(drive);
                 break;
         }
         pm->pm_step = ide_pm_state_completed;
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 176bbc850d6b..72218f3e440f 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -857,7 +857,7 @@ static void probe_hwif(ide_hwif_t *hwif)
 #ifdef CONFIG_IDEDMA_ONLYDISK
                                 if (drive->media == ide_disk)
 #endif
-                                        hwif->ide_dma_check(drive);
+                                        ide_set_dma(drive);
                         }
                 }
         }
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index fbc6d39ace68..5585c01a9b7f 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1135,7 +1135,8 @@ static int set_using_dma (ide_drive_t *drive, int arg)
         if (HWIF(drive)->ide_dma_check == NULL)
                 return -EPERM;
         if (arg) {
-                if (HWIF(drive)->ide_dma_check(drive)) return -EIO;
+                if (ide_set_dma(drive))
+                        return -EIO;
                 if (HWIF(drive)->ide_dma_on(drive)) return -EIO;
         } else {
                 if (__ide_dma_off(drive))
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index b431b990426d..8a723c81c4b8 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -414,9 +414,9 @@ static int auide_dma_check(ide_drive_t *drive)
         speed = ide_find_best_mode(drive, XFER_PIO | XFER_MWDMA);
         
         if (drive->autodma && (speed & XFER_MODE) != XFER_PIO)
-                return HWIF(drive)->ide_dma_on(drive);
+                return 0;
 
-        return HWIF(drive)->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int auide_dma_test_irq(ide_drive_t *drive)
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index 25892814b314..990eafe5ea11 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -209,15 +209,13 @@ static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio)
 
 static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 aec62xx_tune_drive(drive, 5);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int aec62xx_irq_timeout (ide_drive_t *drive)
diff --git a/drivers/ide/pci/alim15x3.c b/drivers/ide/pci/alim15x3.c
index 2baed4e04beb..4debd18d52f8 100644
--- a/drivers/ide/pci/alim15x3.c
+++ b/drivers/ide/pci/alim15x3.c
@@ -507,17 +507,15 @@ static int config_chipset_for_dma (ide_drive_t *drive)
  *
  *      Configure a drive for DMA operation. If DMA is not possible we
  *      drop the drive into PIO mode instead.
- *
- *      FIXME: exactly what are we trying to return here
  */
- 
+
 static int ali15x3_config_drive_for_dma(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct hd_driveid *id   = drive->id;
 
         if ((m5229_revision<=0x20) && (drive->media!=ide_disk))
-                return hwif->ide_dma_off_quietly(drive);
+                goto no_dma_set;
 
         drive->init_speed = 0;
 
@@ -552,9 +550,10 @@ try_dma_modes:
 ata_pio:
                 hwif->tuneproc(drive, 255);
 no_dma_set:
-                return hwif->ide_dma_off_quietly(drive);
+                return -1;
         }
-        return hwif->ide_dma_on(drive);
+
+        return 0;
 }
 
 /**
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index a4336995a410..7989bdd842a2 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -304,8 +304,9 @@ static int amd74xx_ide_dma_check(ide_drive_t *drive)
         amd_set_drive(drive, speed);
 
         if (drive->autodma && (speed & XFER_MODE) != XFER_PIO)
-                return HWIF(drive)->ide_dma_on(drive);
-        return HWIF(drive)->ide_dma_off_quietly(drive);
+                return 0;
+
+        return -1;
 }
 
 /*
diff --git a/drivers/ide/pci/atiixp.c b/drivers/ide/pci/atiixp.c
index 6d372c4e1d81..e7b4415adc83 100644
--- a/drivers/ide/pci/atiixp.c
+++ b/drivers/ide/pci/atiixp.c
@@ -252,21 +252,20 @@ static int atiixp_config_drive_for_dma(ide_drive_t *drive)
 
 static int atiixp_dma_check(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
         u8 tspeed, speed;
 
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && atiixp_config_drive_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive)) {
                 tspeed = ide_get_best_pio_mode(drive, 255, 5, NULL);
                 speed = atiixp_dma_2_pio(XFER_PIO_0 + tspeed) + XFER_PIO_0;
-                hwif->speedproc(drive, speed);
+                atiixp_speedproc(drive, speed);
         }
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /**
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c
index 28f580886693..49df27513da7 100644
--- a/drivers/ide/pci/cmd64x.c
+++ b/drivers/ide/pci/cmd64x.c
@@ -474,15 +474,13 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int cmd64x_config_drive_for_dma (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 config_chipset_for_pio(drive, 1);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int cmd64x_alt_dma_status (struct pci_dev *dev)
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index ba6786aabf3b..400859a839f7 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -132,12 +132,11 @@ static void cs5520_tune_drive(ide_drive_t *drive, u8 pio)
 
 static int cs5520_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-
         /* Tune the drive for PIO modes up to PIO 4 */  
         cs5520_tune_drive(drive, 4);
+
         /* Then tell the core to use DMA operations */
-        return hwif->ide_dma_on(drive);
+        return 0;
 }
 
 /*
diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 68b5d278ca01..ff909cfb96b6 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -196,10 +196,7 @@ static int cs5530_config_dma (ide_drive_t *drive)
                 outl(timings, basereg + 12);    /* write drive1 config register */
         }
 
-        /*
-         * Finally, turn DMA on in software, and exit.
-         */
-        return hwif->ide_dma_on(drive); /* success */
+        return 0;       /* success */
 }
 
 /**
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c
index cd7c4190ad6e..45f43efbf92c 100644
--- a/drivers/ide/pci/cs5535.c
+++ b/drivers/ide/pci/cs5535.c
@@ -195,20 +195,19 @@ static int cs5535_config_drive_for_dma(ide_drive_t *drive)
 
 static int cs5535_dma_check(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = drive->hwif;
         u8 speed;
 
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && cs5535_config_drive_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive)) {
                 speed = ide_get_best_pio_mode(drive, 255, 4, NULL);
                 cs5535_set_drive(drive, speed);
         }
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static u8 __devinit cs5535_cable_detect(struct pci_dev *dev)
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c
index c65971d8d6ad..924eaa3a5708 100644
--- a/drivers/ide/pci/hpt34x.c
+++ b/drivers/ide/pci/hpt34x.c
@@ -109,21 +109,19 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
 #ifndef CONFIG_HPT34X_AUTODMA
-                return hwif->ide_dma_off_quietly(drive);
+                return -1;
 #else
-                return hwif->ide_dma_on(drive);
+                return 0;
 #endif
 
         if (ide_use_fast_pio(drive))
                 hpt34x_tune_drive(drive, 255);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /*
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 752b6d6dde04..60ecdc258c7c 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -736,17 +736,15 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask)
 
 static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 hpt3xx_tune_drive(drive, 255);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /*
diff --git a/drivers/ide/pci/it8213.c b/drivers/ide/pci/it8213.c
index 63248b6909fa..424f00bb160d 100644
--- a/drivers/ide/pci/it8213.c
+++ b/drivers/ide/pci/it8213.c
@@ -244,17 +244,15 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int it8213_config_drive_for_dma (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = drive->hwif;
+        u8 pio;
 
-        if (ide_use_dma(drive)) {
-                if (config_chipset_for_dma(drive))
-                        return hwif->ide_dma_on(drive);
-        }
+        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+                return 0;
 
-        hwif->speedproc(drive, XFER_PIO_0
-                        + ide_get_best_pio_mode(drive, 255, 4, NULL));
+        pio = ide_get_best_pio_mode(drive, 255, 4, NULL);
+        it8213_tune_chipset(drive, XFER_PIO_0 + pio);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /**
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c
index e9bad185968a..35ee17df3f8d 100644
--- a/drivers/ide/pci/it821x.c
+++ b/drivers/ide/pci/it821x.c
@@ -520,14 +520,12 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int it821x_config_drive_for_dma (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+                return 0;
 
-        if (ide_use_dma(drive)) {
-                if (config_chipset_for_dma(drive))
-                        return hwif->ide_dma_on(drive);
-        }
         config_it821x_chipset_for_pio(drive, 1);
-        return hwif->ide_dma_off_quietly(drive);
+
+        return -1;
 }
 
 /**
@@ -612,7 +610,7 @@ static void __devinit it821x_fixups(ide_hwif_t *hwif)
 #ifdef CONFIG_IDEDMA_ONLYDISK
                         if (drive->media == ide_disk)
 #endif
-                                hwif->ide_dma_check(drive);
+                                ide_set_dma(drive);
                 } else {
                         /* Non RAID volume. Fixups to stop the core code
                            doing unsupported things */
diff --git a/drivers/ide/pci/jmicron.c b/drivers/ide/pci/jmicron.c
index 75c2b409908c..53f25500c22b 100644
--- a/drivers/ide/pci/jmicron.c
+++ b/drivers/ide/pci/jmicron.c
@@ -164,14 +164,12 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int jmicron_config_drive_for_dma (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = drive->hwif;
+        if (ide_use_dma(drive) && config_chipset_for_dma(drive))
+                return 0;
 
-        if (ide_use_dma(drive)) {
-                if (config_chipset_for_dma(drive))
-                        return hwif->ide_dma_on(drive);
-        }
         config_jmicron_chipset_for_pio(drive, 1);
-        return hwif->ide_dma_off_quietly(drive);
+
+        return -1;
 }
 
 /**
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c
index 7f2090fac6cb..b310c4f51077 100644
--- a/drivers/ide/pci/ns87415.c
+++ b/drivers/ide/pci/ns87415.c
@@ -190,7 +190,8 @@ static int ns87415_ide_dma_setup(ide_drive_t *drive)
 static int ns87415_ide_dma_check (ide_drive_t *drive)
 {
         if (drive->media != ide_disk)
-                return HWIF(drive)->ide_dma_off_quietly(drive);
+                return -1;
+
         return __ide_dma_check(drive);
 }
 
diff --git a/drivers/ide/pci/pdc202xx_new.c b/drivers/ide/pci/pdc202xx_new.c
index b780e15e9f32..6ceb25bc5a7b 100644
--- a/drivers/ide/pci/pdc202xx_new.c
+++ b/drivers/ide/pci/pdc202xx_new.c
@@ -281,17 +281,15 @@ static int config_chipset_for_dma(ide_drive_t *drive)
 
 static int pdcnew_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
-                hwif->tuneproc(drive, 255);
+                pdcnew_tune_drive(drive, 255);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int pdcnew_quirkproc(ide_drive_t *drive)
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index b2b8e6ea7e90..a7a639fe1eaf 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -322,17 +322,15 @@ chipset_is_set:
 
 static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 pdc202xx_tune_drive(drive, 255);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int pdc202xx_quirkproc (ide_drive_t *drive)
diff --git a/drivers/ide/pci/piix.c b/drivers/ide/pci/piix.c
index caf606a1ee86..569822f4cf55 100644
--- a/drivers/ide/pci/piix.c
+++ b/drivers/ide/pci/piix.c
@@ -386,19 +386,17 @@ static int piix_config_drive_for_dma (ide_drive_t *drive)
  
 static int piix_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && piix_config_drive_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 /* Find best PIO mode. */
-                (void) hwif->speedproc(drive, XFER_PIO_0 +
-                                       ide_get_best_pio_mode(drive, 255, 4, NULL));
+                piix_tune_chipset(drive, XFER_PIO_0 +
+                                  ide_get_best_pio_mode(drive, 255, 4, NULL));
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /**
diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 8d762d323f8b..08e317f281e7 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -241,10 +241,7 @@ static int sc1200_config_dma2 (ide_drive_t *drive, int mode)
 
         outb(inb(hwif->dma_base+2)|(unit?0x40:0x20), hwif->dma_base+2); /* set DMA_capable bit */
 
-        /*
-         * Finally, turn DMA on in software, and exit.
-         */
-        return hwif->ide_dma_on(drive); /* success */
+        return 0;       /* success */
 }
 
 /*
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c
index f44a5ab8fe00..dbcd37a0c652 100644
--- a/drivers/ide/pci/serverworks.c
+++ b/drivers/ide/pci/serverworks.c
@@ -315,17 +315,15 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int svwks_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 config_chipset_for_pio(drive);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const char *name)
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 290697e09e55..cb5c3211bd8e 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -296,9 +296,9 @@ static int sgiioc4_ide_dma_check(ide_drive_t *drive)
         if (ide_config_drive_speed(drive, XFER_MW_DMA_2) != 0) {
                 printk(KERN_WARNING "%s: couldn't set MWDMA2 mode, "
                                     "using PIO instead\n", drive->name);
-                return sgiioc4_ide_dma_off_quietly(drive);
+                return -1;
         } else
-                return sgiioc4_ide_dma_on(drive);
+                return 0;
 }
 
 /* returns 1 if dma irq issued, 0 otherwise */
diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index 1e5b8b17e6d8..7b4c189a9d99 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -414,15 +414,13 @@ static int config_chipset_for_dma (ide_drive_t *drive)
  
 static int siimage_config_drive_for_dma (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 config_chipset_for_pio(drive, 1);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /* returns 1 if dma irq issued, 0 otherwise */
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c
index 53ffeced06ff..2ba0669f36a1 100644
--- a/drivers/ide/pci/sis5513.c
+++ b/drivers/ide/pci/sis5513.c
@@ -669,19 +669,17 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 
 static int sis5513_config_xfer_rate(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         config_art_rwp_pio(drive, 5);
 
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 sis5513_tune_drive(drive, 5);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /* Chip detection and general config */
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index c7025858f237..27b21e120260 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -161,14 +161,14 @@ static int sl82c105_check_drive (ide_drive_t *drive)
                 if (id->field_valid & 2) {
                         if ((id->dma_mword & hwif->mwdma_mask) ||
                             (id->dma_1word & hwif->swdma_mask))
-                                return hwif->ide_dma_on(drive);
+                                return 0;
                 }
 
                 if (__ide_dma_good_drive(drive) && id->eide_dma_time < 150)
-                        return hwif->ide_dma_on(drive);
+                        return 0;
         } while (0);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /*
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c
index 917cc8e61e47..ae7eb58d961c 100644
--- a/drivers/ide/pci/slc90e66.c
+++ b/drivers/ide/pci/slc90e66.c
@@ -179,18 +179,16 @@ static int slc90e66_config_drive_for_dma (ide_drive_t *drive)
 
 static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         drive->init_speed = 0;
 
         if (ide_use_dma(drive) && slc90e66_config_drive_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
-                (void) hwif->speedproc(drive, XFER_PIO_0 +
-                                       ide_get_best_pio_mode(drive, 255, 4, NULL));
+                (void)slc90e66_tune_chipset(drive, XFER_PIO_0 +
+                                ide_get_best_pio_mode(drive, 255, 4, NULL));
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif)
diff --git a/drivers/ide/pci/tc86c001.c b/drivers/ide/pci/tc86c001.c
index 3703fc87d150..0b6d81d6ce48 100644
--- a/drivers/ide/pci/tc86c001.c
+++ b/drivers/ide/pci/tc86c001.c
@@ -185,15 +185,13 @@ static int config_chipset_for_dma(ide_drive_t *drive)
 
 static int tc86c001_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         if (ide_use_dma(drive) && config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
                 tc86c001_tune_drive(drive, 255);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static void __devinit init_hwif_tc86c001(ide_hwif_t *hwif)
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index 1f5f6759fef8..5e06179c3469 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -113,13 +113,12 @@ static int triflex_config_drive_for_dma(ide_drive_t *drive)
 
 static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-
         if (ide_use_dma(drive) && triflex_config_drive_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
+
+        triflex_tune_drive(drive, 255);
 
-        hwif->tuneproc(drive, 255);
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 6fb6e50b8231..a508550c4095 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -240,8 +240,9 @@ static int via82cxxx_ide_dma_check (ide_drive_t *drive)
         via_set_drive(drive, speed);
 
         if (drive->autodma && (speed & XFER_MODE) != XFER_PIO)
-                return hwif->ide_dma_on(drive);
-        return hwif->ide_dma_off_quietly(drive);
+                return 0;
+
+        return -1;
 }
 
 static struct via_isa_bridge *via_config_find(struct pci_dev **isa)
diff --git a/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c
index 7e3e93caafd0..de64b022478b 100644
--- a/drivers/ide/ppc/scc_pata.c
+++ b/drivers/ide/ppc/scc_pata.c
@@ -371,15 +371,13 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive)
 
 static int scc_config_drive_for_dma(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = HWIF(drive);
-
         if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive))
-                return hwif->ide_dma_on(drive);
+                return 0;
 
         if (ide_use_fast_pio(drive))
-                hwif->tuneproc(drive, 4);
+                scc_tuneproc(drive, 4);
 
-        return hwif->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 /**
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 579a8521de63..08f96e8a1902 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1278,6 +1278,7 @@ int __ide_dma_good_drive(ide_drive_t *);
 int ide_use_dma(ide_drive_t *);
 int __ide_dma_off(ide_drive_t *);
 void ide_dma_verbose(ide_drive_t *);
+int ide_set_dma(ide_drive_t *);
 ide_startstop_t ide_dma_intr(ide_drive_t *);
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
@@ -1303,6 +1304,7 @@ extern int __ide_dma_timeout(ide_drive_t *);
 static inline int ide_use_dma(ide_drive_t *drive) { return 0; }
 static inline int __ide_dma_off(ide_drive_t *drive) { return 0; }
 static inline void ide_dma_verbose(ide_drive_t *drive) { ; }
+static inline int ide_set_dma(ide_drive_t *drive) { return 1; }
 #endif /* CONFIG_BLK_DEV_IDEDMA */
 
 #ifndef CONFIG_BLK_DEV_IDEDMA_PCI