diff options
author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2007-07-09 17:17:54 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:54 -0400 |
commit | 841d2a9bf16471716ba3a5172d24aa40a2ea9398 (patch) | |
tree | f836d41ed70bf3efd6350c293c0c31a40ef4f900 /drivers/ide/ide-io.c | |
parent | b740d8846e2e184909e9f74d4ad9d67ae0e084ea (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/ide-io.c')
-rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index bfe8f1b712ba..9f4f8878b551 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -1466,7 +1466,7 @@ void ide_timer_expiry (unsigned long data) | |||
1466 | startstop = handler(drive); | 1466 | startstop = handler(drive); |
1467 | } else if (drive_is_ready(drive)) { | 1467 | } else if (drive_is_ready(drive)) { |
1468 | if (drive->waiting_for_dma) | 1468 | if (drive->waiting_for_dma) |
1469 | (void) hwgroup->hwif->ide_dma_lostirq(drive); | 1469 | hwgroup->hwif->dma_lost_irq(drive); |
1470 | (void)ide_ack_intr(hwif); | 1470 | (void)ide_ack_intr(hwif); |
1471 | printk(KERN_WARNING "%s: lost interrupt\n", drive->name); | 1471 | printk(KERN_WARNING "%s: lost interrupt\n", drive->name); |
1472 | startstop = handler(drive); | 1472 | startstop = handler(drive); |