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-floppy.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-floppy.c')
-rw-r--r-- | drivers/ide/ide-floppy.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index 61969415c57b..57cd21c5b2c1 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
@@ -867,7 +867,7 @@ static ide_startstop_t idefloppy_pc_intr (ide_drive_t *drive) | |||
867 | if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { | 867 | if (test_and_clear_bit(PC_DMA_IN_PROGRESS, &pc->flags)) { |
868 | printk(KERN_ERR "ide-floppy: The floppy wants to issue " | 868 | printk(KERN_ERR "ide-floppy: The floppy wants to issue " |
869 | "more interrupts in DMA mode\n"); | 869 | "more interrupts in DMA mode\n"); |
870 | (void)__ide_dma_off(drive); | 870 | ide_dma_off(drive); |
871 | return ide_do_reset(drive); | 871 | return ide_do_reset(drive); |
872 | } | 872 | } |
873 | 873 | ||
@@ -1097,9 +1097,9 @@ static ide_startstop_t idefloppy_issue_pc (ide_drive_t *drive, idefloppy_pc_t *p | |||
1097 | pc->current_position = pc->buffer; | 1097 | pc->current_position = pc->buffer; |
1098 | bcount.all = min(pc->request_transfer, 63 * 1024); | 1098 | bcount.all = min(pc->request_transfer, 63 * 1024); |
1099 | 1099 | ||
1100 | if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) { | 1100 | if (test_and_clear_bit(PC_DMA_ERROR, &pc->flags)) |
1101 | (void)__ide_dma_off(drive); | 1101 | ide_dma_off(drive); |
1102 | } | 1102 | |
1103 | feature.all = 0; | 1103 | feature.all = 0; |
1104 | 1104 | ||
1105 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) | 1105 | if (test_bit(PC_DMA_RECOMMENDED, &pc->flags) && drive->using_dma) |