10 files changed, 41 insertions, 39 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;
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index ce322602982e..ca55bfa4ac74 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -857,16 +857,19 @@ void ide_dma_lost_irq (ide_drive_t *drive)
 
 EXPORT_SYMBOL(ide_dma_lost_irq);
 
-int __ide_dma_timeout (ide_drive_t *drive)
+void ide_dma_timeout (ide_drive_t *drive)
 {
+        ide_hwif_t *hwif = HWIF(drive);
+
         printk(KERN_ERR "%s: timeout waiting for DMA\n", drive->name);
-        if (HWIF(drive)->ide_dma_test_irq(drive))
-                return 0;
 
-        return HWIF(drive)->ide_dma_end(drive);
+        if (hwif->ide_dma_test_irq(drive))
+                return;
+
+        hwif->ide_dma_end(drive);
 }
 
-EXPORT_SYMBOL(__ide_dma_timeout);
+EXPORT_SYMBOL(ide_dma_timeout);
 
 /*
  * Needed for allowing full modular support of ide-driver
@@ -1017,8 +1020,8 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
                 hwif->ide_dma_end = &__ide_dma_end;
         if (!hwif->ide_dma_test_irq)
                 hwif->ide_dma_test_irq = &__ide_dma_test_irq;
-        if (!hwif->ide_dma_timeout)
-                hwif->ide_dma_timeout = &__ide_dma_timeout;
+        if (!hwif->dma_timeout)
+                hwif->dma_timeout = &ide_dma_timeout;
         if (!hwif->dma_lost_irq)
                 hwif->dma_lost_irq = &ide_dma_lost_irq;
 
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 9f4f8878b551..c5b5011da56e 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1350,7 +1350,7 @@ static ide_startstop_t ide_dma_timeout_retry(ide_drive_t *drive, int error)
                                                 hwif->INB(IDE_STATUS_REG));
         } else {
                 printk(KERN_WARNING "%s: DMA timeout retry\n", drive->name);
-                (void) hwif->ide_dma_timeout(drive);
+                hwif->dma_timeout(drive);
         }
 
         /*
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 8a8674d3223f..3717a329b43b 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -497,7 +497,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
         hwif->dma_host_on               = tmp_hwif->dma_host_on;
         hwif->dma_host_off              = tmp_hwif->dma_host_off;
         hwif->dma_lost_irq              = tmp_hwif->dma_lost_irq;
-        hwif->ide_dma_timeout           = tmp_hwif->ide_dma_timeout;
+        hwif->dma_timeout               = tmp_hwif->dma_timeout;
 
         hwif->OUTB                      = tmp_hwif->OUTB;
         hwif->OUTBSYNC                  = tmp_hwif->OUTBSYNC;
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index e8935519edbe..405903c42ba1 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -488,16 +488,16 @@ static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 de
   
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
 
-static int auide_dma_timeout(ide_drive_t *drive)
+static void auide_dma_timeout(ide_drive_t *drive)
 {
-//      printk("%s\n", __FUNCTION__);
+        ide_hwif_t *hwif = HWIF(drive);
 
         printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name);
 
-        if (HWIF(drive)->ide_dma_test_irq(drive))
-                return 0;
+        if (hwif->ide_dma_test_irq(drive))
+                return;
 
-        return HWIF(drive)->ide_dma_end(drive);
+        hwif->ide_dma_end(drive);
 }
                                         
 
@@ -720,7 +720,7 @@ static int au_ide_probe(struct device *dev)
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
         hwif->dma_off_quietly           = &auide_dma_off_quietly;
-        hwif->ide_dma_timeout           = &auide_dma_timeout;
+        hwif->dma_timeout               = &auide_dma_timeout;
 
         hwif->ide_dma_check             = &auide_dma_check;
         hwif->dma_exec_cmd              = &auide_dma_exec_cmd;
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;
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c
index ca72ad202ebc..f9bada093d19 100644
--- a/drivers/ide/ppc/pmac.c
+++ b/drivers/ide/ppc/pmac.c
@@ -2056,7 +2056,7 @@ pmac_ide_setup_dma(pmac_ide_hwif_t *pmif, ide_hwif_t *hwif)
         hwif->ide_dma_test_irq = &pmac_ide_dma_test_irq;
         hwif->dma_host_off = &pmac_ide_dma_host_off;
         hwif->dma_host_on = &pmac_ide_dma_host_on;
-        hwif->ide_dma_timeout = &__ide_dma_timeout;
+        hwif->dma_timeout = &ide_dma_timeout;
         hwif->dma_lost_irq = &pmac_ide_dma_lost_irq;
 
         hwif->atapi_dma = 1;