ide: merge ->dma_host_{on,off} methods into ->dma_host_set method

Merge ->dma_host_{on,off} methods into ->dma_host_set method
which takes 'int on' argument.

There should be no functionality changes caused by this patch.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e30f67e09b9c..595a5cef41a2 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -742,8 +742,8 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
 //              msleep(50);
 
 #ifdef CONFIG_BLK_DEV_IDEDMA
-        if (hwif->dma_host_on)  /* check if host supports DMA */
-                hwif->dma_host_off(drive);
+        if (hwif->dma_host_set) /* check if host supports DMA */
+                hwif->dma_host_set(drive, 0);
 #endif
 
         /* Skip setting PIO flow-control modes on pre-EIDE drives */
@@ -801,8 +801,8 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
 #ifdef CONFIG_BLK_DEV_IDEDMA
         if ((speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA)) &&
             drive->using_dma)
-                hwif->dma_host_on(drive);
-        else if (hwif->dma_host_on)     /* check if host supports DMA */
+                hwif->dma_host_set(drive, 1);
+        else if (hwif->dma_host_set)    /* check if host supports DMA */
                 ide_dma_off_quietly(drive);
 #endif