aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/pdc202xx_old.c
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2007-07-09 17:17:54 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-07-09 17:17:54 -0400
commit841d2a9bf16471716ba3a5172d24aa40a2ea9398 (patch)
treef836d41ed70bf3efd6350c293c0c31a40ef4f900 /drivers/ide/pci/pdc202xx_old.c
parentb740d8846e2e184909e9f74d4ad9d67ae0e084ea (diff)
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>
Diffstat (limited to 'drivers/ide/pci/pdc202xx_old.c')
-rw-r--r--drivers/ide/pci/pdc202xx_old.c13
1 files changed, 8 insertions, 5 deletions
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:
267 return (dma_stat & 4) == 4; /* return 1 if INTR asserted */ 267 return (dma_stat & 4) == 4; /* return 1 if INTR asserted */
268} 268}
269 269
270static int pdc202xx_ide_dma_lostirq(ide_drive_t *drive) 270static void pdc202xx_dma_lost_irq(ide_drive_t *drive)
271{ 271{
272 if (HWIF(drive)->resetproc != NULL) 272 ide_hwif_t *hwif = HWIF(drive);
273 HWIF(drive)->resetproc(drive); 273
274 return __ide_dma_lostirq(drive); 274 if (hwif->resetproc != NULL)
275 hwif->resetproc(drive);
276
277 ide_dma_lost_irq(drive);
275} 278}
276 279
277static int pdc202xx_ide_dma_timeout(ide_drive_t *drive) 280static int pdc202xx_ide_dma_timeout(ide_drive_t *drive)
@@ -347,7 +350,7 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif)
347 hwif->err_stops_fifo = 1; 350 hwif->err_stops_fifo = 1;
348 351
349 hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate; 352 hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate;
350 hwif->ide_dma_lostirq = &pdc202xx_ide_dma_lostirq; 353 hwif->dma_lost_irq = &pdc202xx_dma_lost_irq;
351 hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout; 354 hwif->ide_dma_timeout = &pdc202xx_ide_dma_timeout;
352 355
353 if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) { 356 if (hwif->pci_dev->device != PCI_DEVICE_ID_PROMISE_20246) {