aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/arm/icside.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/arm/icside.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/arm/icside.c')
-rw-r--r--drivers/ide/arm/icside.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 66f826252aee..543f8b51f6b1 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -461,10 +461,9 @@ static int icside_dma_timeout(ide_drive_t *drive)
461 return icside_dma_end(drive); 461 return icside_dma_end(drive);
462} 462}
463 463
464static int icside_dma_lostirq(ide_drive_t *drive) 464static void icside_dma_lost_irq(ide_drive_t *drive)
465{ 465{
466 printk(KERN_ERR "%s: IRQ lost\n", drive->name); 466 printk(KERN_ERR "%s: IRQ lost\n", drive->name);
467 return 1;
468} 467}
469 468
470static void icside_dma_init(ide_hwif_t *hwif) 469static void icside_dma_init(ide_hwif_t *hwif)
@@ -491,7 +490,7 @@ static void icside_dma_init(ide_hwif_t *hwif)
491 hwif->ide_dma_end = icside_dma_end; 490 hwif->ide_dma_end = icside_dma_end;
492 hwif->ide_dma_test_irq = icside_dma_test_irq; 491 hwif->ide_dma_test_irq = icside_dma_test_irq;
493 hwif->ide_dma_timeout = icside_dma_timeout; 492 hwif->ide_dma_timeout = icside_dma_timeout;
494 hwif->ide_dma_lostirq = icside_dma_lostirq; 493 hwif->dma_lost_irq = icside_dma_lost_irq;
495 494
496 hwif->drives[0].autodma = hwif->autodma; 495 hwif->drives[0].autodma = hwif->autodma;
497 hwif->drives[1].autodma = hwif->autodma; 496 hwif->drives[1].autodma = hwif->autodma;