ide: make ide_hwif_t.ide_dma_host_on void (v2)

* since ide_hwif_t.ide_dma_host_on is called either when drive->using_dma == 1
  or when return value is discarded make it void, also drop "ide_" prefix
* make __ide_dma_host_on() void and drop "__" prefix

v2:
* while at it rename atiixp_ide_dma_host_on() to atiixp_dma_host_on()
  and sgiioc4_ide_dma_host_on() to sgiioc4_dma_host_on().
  [ Noticed by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]

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

1 files changed, 7 insertions, 10 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index a15217b136f5..08e7cd043bcc 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -468,14 +468,14 @@ EXPORT_SYMBOL(ide_dma_off);
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
 /**
- *      __ide_dma_host_on       -       Enable DMA on a host
+ *      ide_dma_host_on -       Enable DMA on a host
  *      @drive: drive to enable for DMA
  *
  *      Enable DMA on an IDE controller following generic bus mastering
  *      IDE controller behaviour
  */
- 
-int __ide_dma_host_on (ide_drive_t *drive)
+
+void ide_dma_host_on(ide_drive_t *drive)
 {
         if (drive->using_dma) {
                 ide_hwif_t *hwif        = HWIF(drive);
@@ -483,12 +483,10 @@ int __ide_dma_host_on (ide_drive_t *drive)
                 u8 dma_stat             = hwif->INB(hwif->dma_status);
 
                 hwif->OUTB((dma_stat|(1<<(5+unit))), hwif->dma_status);
-                return 0;
         }
-        return 1;
 }
 
-EXPORT_SYMBOL(__ide_dma_host_on);
+EXPORT_SYMBOL(ide_dma_host_on);
 
 /**
  *      __ide_dma_on            -       Enable DMA on a device
@@ -506,8 +504,7 @@ int __ide_dma_on (ide_drive_t *drive)
         drive->using_dma = 1;
         ide_toggle_bounce(drive, 1);
 
-        if (HWIF(drive)->ide_dma_host_on(drive))
-                return 1;
+        drive->hwif->dma_host_on(drive);
 
         return 0;
 }
@@ -940,8 +937,8 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
                 hwif->dma_host_off = &ide_dma_host_off;
         if (!hwif->ide_dma_on)
                 hwif->ide_dma_on = &__ide_dma_on;
-        if (!hwif->ide_dma_host_on)
-                hwif->ide_dma_host_on = &__ide_dma_host_on;
+        if (!hwif->dma_host_on)
+                hwif->dma_host_on = &ide_dma_host_on;
         if (!hwif->ide_dma_check)
                 hwif->ide_dma_check = &__ide_dma_check;
         if (!hwif->dma_setup)