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>

1 files changed, 4 insertions, 5 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index ead141e2db9e..ce322602982e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -850,13 +850,12 @@ int ide_set_dma(ide_drive_t *drive)
 EXPORT_SYMBOL_GPL(ide_set_dma);
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
-int __ide_dma_lostirq (ide_drive_t *drive)
+void ide_dma_lost_irq (ide_drive_t *drive)
 {
         printk("%s: DMA interrupt recovery\n", drive->name);
-        return 1;
 }
 
-EXPORT_SYMBOL(__ide_dma_lostirq);
+EXPORT_SYMBOL(ide_dma_lost_irq);
 
 int __ide_dma_timeout (ide_drive_t *drive)
 {
@@ -1020,8 +1019,8 @@ void ide_setup_dma (ide_hwif_t *hwif, unsigned long dma_base, unsigned int num_p
                 hwif->ide_dma_test_irq = &__ide_dma_test_irq;
         if (!hwif->ide_dma_timeout)
                 hwif->ide_dma_timeout = &__ide_dma_timeout;
-        if (!hwif->ide_dma_lostirq)
-                hwif->ide_dma_lostirq = &__ide_dma_lostirq;
+        if (!hwif->dma_lost_irq)
+                hwif->dma_lost_irq = &ide_dma_lost_irq;
 
         if (hwif->chipset != ide_trm290) {
                 u8 dma_stat = hwif->INB(hwif->dma_status);