diff options
Diffstat (limited to 'drivers/ide/mips/au1xxx-ide.c')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 8a723c81c4b8..266ef37a2807 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -449,16 +449,13 @@ static int auide_dma_on(ide_drive_t *drive) | |||
449 | return auide_dma_host_on(drive); | 449 | return auide_dma_host_on(drive); |
450 | } | 450 | } |
451 | 451 | ||
452 | 452 | static void auide_dma_host_off(ide_drive_t *drive) | |
453 | static int auide_dma_host_off(ide_drive_t *drive) | ||
454 | { | 453 | { |
455 | return 0; | ||
456 | } | 454 | } |
457 | 455 | ||
458 | static int auide_dma_off_quietly(ide_drive_t *drive) | 456 | static void auide_dma_off_quietly(ide_drive_t *drive) |
459 | { | 457 | { |
460 | drive->using_dma = 0; | 458 | drive->using_dma = 0; |
461 | return auide_dma_host_off(drive); | ||
462 | } | 459 | } |
463 | 460 | ||
464 | static int auide_dma_lostirq(ide_drive_t *drive) | 461 | static int auide_dma_lostirq(ide_drive_t *drive) |
@@ -724,7 +721,7 @@ static int au_ide_probe(struct device *dev) | |||
724 | hwif->speedproc = &auide_tune_chipset; | 721 | hwif->speedproc = &auide_tune_chipset; |
725 | 722 | ||
726 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 723 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
727 | hwif->ide_dma_off_quietly = &auide_dma_off_quietly; | 724 | hwif->dma_off_quietly = &auide_dma_off_quietly; |
728 | hwif->ide_dma_timeout = &auide_dma_timeout; | 725 | hwif->ide_dma_timeout = &auide_dma_timeout; |
729 | 726 | ||
730 | hwif->ide_dma_check = &auide_dma_check; | 727 | hwif->ide_dma_check = &auide_dma_check; |
@@ -733,7 +730,7 @@ static int au_ide_probe(struct device *dev) | |||
733 | hwif->ide_dma_end = &auide_dma_end; | 730 | hwif->ide_dma_end = &auide_dma_end; |
734 | hwif->dma_setup = &auide_dma_setup; | 731 | hwif->dma_setup = &auide_dma_setup; |
735 | hwif->ide_dma_test_irq = &auide_dma_test_irq; | 732 | hwif->ide_dma_test_irq = &auide_dma_test_irq; |
736 | hwif->ide_dma_host_off = &auide_dma_host_off; | 733 | hwif->dma_host_off = &auide_dma_host_off; |
737 | hwif->ide_dma_host_on = &auide_dma_host_on; | 734 | hwif->ide_dma_host_on = &auide_dma_host_on; |
738 | hwif->ide_dma_lostirq = &auide_dma_lostirq; | 735 | hwif->ide_dma_lostirq = &auide_dma_lostirq; |
739 | hwif->ide_dma_on = &auide_dma_on; | 736 | hwif->ide_dma_on = &auide_dma_on; |