diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:26 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:26 -0500 |
commit | 7469aaf6a30f4187ed6de7c0aed5c2dd2d1c2d31 (patch) | |
tree | 079930f23b3d14e4ad29ab972bc6d91fde52e5f0 /drivers/ide/ide-tape.c | |
parent | 3608b5d71a52c053787dbad6af20c25f7e0b75a9 (diff) |
ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
* since ide_hwif_t.ide_dma_{host_off,off_quietly} always return '0'
make these functions void and while at it drop "ide_" prefix
* fix comment for __ide_dma_off_quietly()
* make __ide_dma_{host_off,off_quietly,off}() void and drop "__" prefix
v2:
* while at it rename atiixp_ide_dma_host_off() to atiixp_dma_host_off(),
sgiioc4_ide_dma_{host_off,off_quietly}() to sgiioc4_dma_{host_off,off_quietly}()
and sl82c105_ide_dma_off_quietly() to sl82c105_dma_off_quietly()
[ Noticed by Sergei Shtylyov <sshtylyov@ru.mvista.com>. ]
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-tape.c')
-rw-r--r-- | drivers/ide/ide-tape.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index be6d818d0db8..4e59239fef75 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c | |||
@@ -1970,7 +1970,7 @@ static ide_startstop_t idetape_pc_intr (ide_drive_t *drive) | |||
1970 | printk(KERN_ERR "ide-tape: The tape wants to issue more " | 1970 | printk(KERN_ERR "ide-tape: The tape wants to issue more " |
1971 | "interrupts in DMA mode\n"); | 1971 | "interrupts in DMA mode\n"); |
1972 | printk(KERN_ERR "ide-tape: DMA disabled, reverting to PIO\n"); | 1972 | printk(KERN_ERR "ide-tape: DMA disabled, reverting to PIO\n"); |
1973 | (void)__ide_dma_off(drive); | 1973 | ide_dma_off(drive); |
1974 | return ide_do_reset(drive); | 1974 | return ide_do_reset(drive); |
1975 | } | 1975 | } |
1976 | /* Get the number of bytes to transfer on this interrupt. */ | 1976 | /* Get the number of bytes to transfer on this interrupt. */ |
@@ -2176,7 +2176,7 @@ static ide_startstop_t idetape_issue_packet_command (ide_drive_t *drive, idetape | |||
2176 | if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) { | 2176 | if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) { |
2177 | printk(KERN_WARNING "ide-tape: DMA disabled, " | 2177 | printk(KERN_WARNING "ide-tape: DMA disabled, " |
2178 | "reverting to PIO\n"); | 2178 | "reverting to PIO\n"); |
2179 | (void)__ide_dma_off(drive); | 2179 | ide_dma_off(drive); |
2180 | } | 2180 | } |
2181 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) | 2181 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) |
2182 | dma_ok = !hwif->dma_setup(drive); | 2182 | dma_ok = !hwif->dma_setup(drive); |