ide: make void and rename ide_dma_timeout() method

Since ide_dma_timeout() method's result is discarded, make it return 'void'.
While at it, drop 'ide_' from the method's name, drop the '__' prefix from
the default method's name, and do some cleanups in this method driver-wise:

- in ide-dma.c, au1xxx-ide.c, and pdc202xx_old.c, define/use 'hwif' variable;

- in au1xxx-ide.c, get rid of commented out printk();

- in sl82c105.c, get rid of unnecessary variables.

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

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 543f8b51f6b1..444a0b84f5bd 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -448,17 +448,16 @@ static int icside_dma_test_irq(ide_drive_t *drive)
                         ICS_ARCIN_V6_INTRSTAT_1)) & 1;
 }
 
-static int icside_dma_timeout(ide_drive_t *drive)
+static void icside_dma_timeout(ide_drive_t *drive)
 {
         printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
 
         if (icside_dma_test_irq(drive))
-                return 0;
+                return;
 
-        ide_dump_status(drive, "DMA timeout",
-                HWIF(drive)->INB(IDE_STATUS_REG));
+        ide_dump_status(drive, "DMA timeout", HWIF(drive)->INB(IDE_STATUS_REG));
 
-        return icside_dma_end(drive);
+        icside_dma_end(drive);
 }
 
 static void icside_dma_lost_irq(ide_drive_t *drive)
@@ -489,7 +488,7 @@ static void icside_dma_init(ide_hwif_t *hwif)
         hwif->dma_start         = icside_dma_start;
         hwif->ide_dma_end       = icside_dma_end;
         hwif->ide_dma_test_irq  = icside_dma_test_irq;
-        hwif->ide_dma_timeout   = icside_dma_timeout;
+        hwif->dma_timeout       = icside_dma_timeout;
         hwif->dma_lost_irq      = icside_dma_lost_irq;
 
         hwif->drives[0].autodma = hwif->autodma;