ide: make void and rename ide_dma_lostirq() method

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

- in aec62xx.c, rename the method in accordance with other drivers, and get rid
  of unnecessary variables there;

- in pdc202xx_old.c, define/use 'hwif' variable;

- in sgiioc4.c, rearrange the code to call the resetproc() method directly.

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

5 files changed, 25 insertions, 29 deletions

diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c
index b173bc66ce1e..bed32d0eaa37 100644
--- a/drivers/ide/pci/aec62xx.c
+++ b/drivers/ide/pci/aec62xx.c
@@ -172,12 +172,9 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
         return -1;
 }
 
-static int aec62xx_irq_timeout (ide_drive_t *drive)
+static void aec62xx_dma_lost_irq (ide_drive_t *drive)
 {
-        ide_hwif_t *hwif        = HWIF(drive);
-        struct pci_dev *dev     = hwif->pci_dev;
-
-        switch(dev->device) {
+        switch (HWIF(drive)->pci_dev->device) {
                 case PCI_DEVICE_ID_ARTOP_ATP860:
                 case PCI_DEVICE_ID_ARTOP_ATP860R:
                 case PCI_DEVICE_ID_ARTOP_ATP865:
@@ -186,7 +183,6 @@ static int aec62xx_irq_timeout (ide_drive_t *drive)
                 default:
                         break;
         }
-        return 0;
 }
 
 static unsigned int __devinit init_chipset_aec62xx(struct pci_dev *dev, const char *name)
@@ -254,7 +250,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
         hwif->mwdma_mask = 0x07;
 
         hwif->ide_dma_check     = &aec62xx_config_drive_xfer_rate;
-        hwif->ide_dma_lostirq   = &aec62xx_irq_timeout;
+        hwif->dma_lost_irq      = &aec62xx_dma_lost_irq;
 
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
index c33d0b0f11c9..34d06dc7f2b2 100644
--- a/drivers/ide/pci/hpt366.c
+++ b/drivers/ide/pci/hpt366.c
@@ -737,7 +737,7 @@ static int hpt366_config_drive_xfer_rate(ide_drive_t *drive)
  * This is specific to the HPT366 UDMA chipset
  * by HighPoint|Triones Technologies, Inc.
  */
-static int hpt366_ide_dma_lostirq(ide_drive_t *drive)
+static void hpt366_dma_lost_irq(ide_drive_t *drive)
 {
         struct pci_dev *dev = HWIF(drive)->pci_dev;
         u8 mcr1 = 0, mcr3 = 0, scr1 = 0;
@@ -749,7 +749,7 @@ static int hpt366_ide_dma_lostirq(ide_drive_t *drive)
                 drive->name, __FUNCTION__, mcr1, mcr3, scr1);
         if (scr1 & 0x10)
                 pci_write_config_byte(dev, 0x5a, scr1 & ~0x10);
-        return __ide_dma_lostirq(drive);
+        ide_dma_lost_irq(drive);
 }
 
 static void hpt370_clear_engine(ide_drive_t *drive)
@@ -1355,7 +1355,7 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif)
                 hwif->ide_dma_end       = &hpt370_ide_dma_end;
                 hwif->ide_dma_timeout   = &hpt370_ide_dma_timeout;
         } else
-                hwif->ide_dma_lostirq   = &hpt366_ide_dma_lostirq;
+                hwif->dma_lost_irq      = &hpt366_dma_lost_irq;
 
         if (!noautodma)
                 hwif->autodma = 1;
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c
index 23844687deea..5013df84e971 100644
--- a/drivers/ide/pci/pdc202xx_old.c
+++ b/drivers/ide/pci/pdc202xx_old.c
@@ -267,11 +267,14 @@ somebody_else:
         return (dma_stat & 4) == 4;     /* return 1 if INTR asserted */
 }
 
-static int pdc202xx_ide_dma_lostirq(ide_drive_t *drive)
+static void pdc202xx_dma_lost_irq(ide_drive_t *drive)
 {
-        if (HWIF(drive)->resetproc != NULL)
-                HWIF(drive)->resetproc(drive);
-        return __ide_dma_lostirq(drive);
+        ide_hwif_t *hwif = HWIF(drive);
+
+        if (hwif->resetproc != NULL)
+                hwif->resetproc(drive);
+
+        ide_dma_lost_irq(drive);
 }
 
 static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
@@ -347,7 +350,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
         hwif->err_stops_fifo = 1;
 
         hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
-        hwif->ide_dma_lostirq = &pdc202xx_ide_dma_lostirq;
+        hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
         hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout;
 
         if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c
index d3185e29a38e..53bee59264ef 100644
--- a/drivers/ide/pci/sgiioc4.c
+++ b/drivers/ide/pci/sgiioc4.c
@@ -316,14 +316,6 @@ static void sgiioc4_dma_host_off(ide_drive_t * drive)
         sgiioc4_clearirq(drive);
 }
 
-static int
-sgiioc4_ide_dma_lostirq(ide_drive_t * drive)
-{
-        HWIF(drive)->resetproc(drive);
-
-        return __ide_dma_lostirq(drive);
-}
-
 static void
 sgiioc4_resetproc(ide_drive_t * drive)
 {
@@ -331,6 +323,14 @@ sgiioc4_resetproc(ide_drive_t * drive)
         sgiioc4_clearirq(drive);
 }
 
+static void
+sgiioc4_dma_lost_irq(ide_drive_t * drive)
+{
+        sgiioc4_resetproc(drive);
+
+        ide_dma_lost_irq(drive);
+}
+
 static u8
 sgiioc4_INB(unsigned long port)
 {
@@ -607,7 +607,7 @@ ide_init_sgiioc4(ide_hwif_t * hwif)
         hwif->ide_dma_test_irq = &sgiioc4_ide_dma_test_irq;
         hwif->dma_host_on = &sgiioc4_dma_host_on;
         hwif->dma_host_off = &sgiioc4_dma_host_off;
-        hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
+        hwif->dma_lost_irq = &sgiioc4_dma_lost_irq;
         hwif->ide_dma_timeout = &__ide_dma_timeout;
 
         hwif->INB = &sgiioc4_INB;
diff --git a/drivers/ide/pci/sl82c105.c b/drivers/ide/pci/sl82c105.c
index 7c383d9cc472..202ce4965b60 100644
--- a/drivers/ide/pci/sl82c105.c
+++ b/drivers/ide/pci/sl82c105.c
@@ -195,7 +195,7 @@ static inline void sl82c105_reset_host(struct pci_dev *dev)
  * This function is called when the IDE timer expires, the drive
  * indicates that it is READY, and we were waiting for DMA to complete.
  */
-static int sl82c105_ide_dma_lostirq(ide_drive_t *drive)
+static void sl82c105_dma_lost_irq(ide_drive_t *drive)
 {
         ide_hwif_t *hwif        = HWIF(drive);
         struct pci_dev *dev     = hwif->pci_dev;
@@ -222,9 +222,6 @@ static int sl82c105_ide_dma_lostirq(ide_drive_t *drive)
         }
 
         sl82c105_reset_host(dev);
-
-        /* __ide_dma_lostirq would return 1, so we do as well */
-        return 1;
 }
 
 /*
@@ -441,7 +438,7 @@ static void __devinit init_hwif_sl82c105(ide_hwif_t *hwif)
         hwif->ide_dma_check             = &sl82c105_ide_dma_check;
         hwif->ide_dma_on                = &sl82c105_ide_dma_on;
         hwif->dma_off_quietly           = &sl82c105_dma_off_quietly;
-        hwif->ide_dma_lostirq           = &sl82c105_ide_dma_lostirq;
+        hwif->dma_lost_irq              = &sl82c105_dma_lost_irq;
         hwif->dma_start                 = &sl82c105_dma_start;
         hwif->ide_dma_timeout           = &sl82c105_ide_dma_timeout;