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>

4 files changed, 17 insertions, 17 deletions

diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index 34d06dc7f2b2..65018814ed73 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -799,10 +799,10 @@ static int hpt370_ide_dma_end(ide_drive_t *drive)
         return __ide_dma_end(drive);
 }
 
-static int hpt370_ide_dma_timeout(ide_drive_t *drive)
+static void hpt370_dma_timeout(ide_drive_t *drive)
 {
         hpt370_irq_timeout(drive);
-        return __ide_dma_timeout(drive);
+        ide_dma_timeout(drive);
 }
 
 /* returns 1 if DMA IRQ issued, 0 otherwise */
@@ -1353,7 +1353,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
         } else if (chip_type >= HPT370) {
                 hwif->dma_start         = &hpt370_ide_dma_start;
                 hwif->ide_dma_end       = &hpt370_ide_dma_end;
-                hwif->ide_dma_timeout   = &hpt370_ide_dma_timeout;
+                hwif->dma_timeout       = &hpt370_dma_timeout;
         } else
                 hwif->dma_lost_irq      = &hpt366_dma_lost_irq;
 
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 5013df84e971..ae628b86e18a 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -277,11 +277,14 @@ static void pdc202xx_dma_lost_irq(ide_drive_t *drive)
         ide_dma_lost_irq(drive);
 }
 
-static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
+static void pdc202xx_dma_timeout(ide_drive_t *drive)
 {
-        if (HWIF(drive)->resetproc != NULL)
-                HWIF(drive)->resetproc(drive);
-        return __ide_dma_timeout(drive);
+        ide_hwif_t *hwif = HWIF(drive);
+
+        if (hwif->resetproc != NULL)
+                hwif->resetproc(drive);
+
+        ide_dma_timeout(drive);
 }
 
 static void pdc202xx_reset_host (ide_hwif_t *hwif)
@@ -351,7 +354,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
 
         hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
         hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
-        hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout;
+        hwif->dma_timeout = &pdc202xx_dma_timeout;
 
         if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
                 if (!(hwif->udma_four))
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index 53bee59264ef..d396b2929ed8 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -608,7 +608,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->dma_host_on = &sgiioc4_dma_host_on;
         hwif->dma_host_off = &sgiioc4_dma_host_off;
         hwif->dma_lost_irq = &sgiioc4_dma_lost_irq;
-        hwif->ide_dma_timeout = &__ide_dma_timeout;
+        hwif->dma_timeout = &ide_dma_timeout;
 
         hwif->INB = &sgiioc4_INB;
 }
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 202ce4965b60..487879842af4 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -241,15 +241,12 @@ static void sl82c105_dma_start(ide_drive_t *drive)
         ide_dma_start(drive);
 }
 
-static int sl82c105_ide_dma_timeout(ide_drive_t *drive)
+static void sl82c105_dma_timeout(ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
+        DBG(("sl82c105_dma_timeout(drive:%s)\n", drive->name));
 
-        DBG(("sl82c105_ide_dma_timeout(drive:%s)\n", drive->name));
-
-        sl82c105_reset_host(dev);
-        return __ide_dma_timeout(drive);
+        sl82c105_reset_host(HWIF(drive)->pci_dev);
+        ide_dma_timeout(drive);
 }
 
 static int sl82c105_ide_dma_on(ide_drive_t *drive)
@@ -440,7 +437,7 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         hwif->dma_off_quietly           = &sl82c105_dma_off_quietly;
         hwif->dma_lost_irq              = &sl82c105_dma_lost_irq;
         hwif->dma_start                 = &sl82c105_dma_start;
-        hwif->ide_dma_timeout           = &sl82c105_ide_dma_timeout;
+        hwif->dma_timeout               = &sl82c105_dma_timeout;
 
         if (!noautodma)
                 hwif->autodma = 1;