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/mips | |
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/mips')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index ca95e990862e..e8935519edbe 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -456,10 +456,9 @@ static void auide_dma_off_quietly(ide_drive_t *drive) | |||
456 | drive->using_dma = 0; | 456 | drive->using_dma = 0; |
457 | } | 457 | } |
458 | 458 | ||
459 | static int auide_dma_lostirq(ide_drive_t *drive) | 459 | static void auide_dma_lost_irq(ide_drive_t *drive) |
460 | { | 460 | { |
461 | printk(KERN_ERR "%s: IRQ lost\n", drive->name); | 461 | printk(KERN_ERR "%s: IRQ lost\n", drive->name); |
462 | return 0; | ||
463 | } | 462 | } |
464 | 463 | ||
465 | static void auide_ddma_tx_callback(int irq, void *param) | 464 | static void auide_ddma_tx_callback(int irq, void *param) |
@@ -731,7 +730,7 @@ static int au_ide_probe(struct device *dev) | |||
731 | hwif->ide_dma_test_irq = &auide_dma_test_irq; | 730 | hwif->ide_dma_test_irq = &auide_dma_test_irq; |
732 | hwif->dma_host_off = &auide_dma_host_off; | 731 | hwif->dma_host_off = &auide_dma_host_off; |
733 | hwif->dma_host_on = &auide_dma_host_on; | 732 | hwif->dma_host_on = &auide_dma_host_on; |
734 | hwif->ide_dma_lostirq = &auide_dma_lostirq; | 733 | hwif->dma_lost_irq = &auide_dma_lost_irq; |
735 | hwif->ide_dma_on = &auide_dma_on; | 734 | hwif->ide_dma_on = &auide_dma_on; |
736 | 735 | ||
737 | hwif->autodma = 1; | 736 | hwif->autodma = 1; |