ide: add ide_set_dma() helper (v2)

* add ide_set_dma() helper and make ide_hwif_t.ide_dma_check return
  -1 when DMA needs to be disabled (== need to call ->ide_dma_off_quietly)
   0 when DMA needs to be enabled  (== need to call ->ide_dma_on)
   1 when DMA setting shouldn't be changed
* fix IDE code to use ide_set_dma() instead if using ->ide_dma_check directly

v2:
* updated for scc_pata

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 5 insertions, 7 deletions

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 */