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-iops.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-iops.c')
-rw-r--r-- | drivers/ide/ide-iops.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index 09c30cbf4bd7..5ecdb11a3462 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -753,7 +753,7 @@ int ide_config_drive_speed (ide_drive_t *drive, u8 speed) | |||
753 | 753 | ||
754 | #ifdef CONFIG_BLK_DEV_IDEDMA | 754 | #ifdef CONFIG_BLK_DEV_IDEDMA |
755 | if (hwif->ide_dma_check) /* check if host supports DMA */ | 755 | if (hwif->ide_dma_check) /* check if host supports DMA */ |
756 | hwif->ide_dma_host_off(drive); | 756 | hwif->dma_host_off(drive); |
757 | #endif | 757 | #endif |
758 | 758 | ||
759 | /* | 759 | /* |
@@ -832,7 +832,7 @@ int ide_config_drive_speed (ide_drive_t *drive, u8 speed) | |||
832 | if (speed >= XFER_SW_DMA_0) | 832 | if (speed >= XFER_SW_DMA_0) |
833 | hwif->ide_dma_host_on(drive); | 833 | hwif->ide_dma_host_on(drive); |
834 | else if (hwif->ide_dma_check) /* check if host supports DMA */ | 834 | else if (hwif->ide_dma_check) /* check if host supports DMA */ |
835 | hwif->ide_dma_off_quietly(drive); | 835 | hwif->dma_off_quietly(drive); |
836 | #endif | 836 | #endif |
837 | 837 | ||
838 | switch(speed) { | 838 | switch(speed) { |
@@ -1042,12 +1042,12 @@ static void check_dma_crc(ide_drive_t *drive) | |||
1042 | { | 1042 | { |
1043 | #ifdef CONFIG_BLK_DEV_IDEDMA | 1043 | #ifdef CONFIG_BLK_DEV_IDEDMA |
1044 | if (drive->crc_count) { | 1044 | if (drive->crc_count) { |
1045 | (void) HWIF(drive)->ide_dma_off_quietly(drive); | 1045 | drive->hwif->dma_off_quietly(drive); |
1046 | ide_set_xfer_rate(drive, ide_auto_reduce_xfer(drive)); | 1046 | ide_set_xfer_rate(drive, ide_auto_reduce_xfer(drive)); |
1047 | if (drive->current_speed >= XFER_SW_DMA_0) | 1047 | if (drive->current_speed >= XFER_SW_DMA_0) |
1048 | (void) HWIF(drive)->ide_dma_on(drive); | 1048 | (void) HWIF(drive)->ide_dma_on(drive); |
1049 | } else | 1049 | } else |
1050 | (void)__ide_dma_off(drive); | 1050 | ide_dma_off(drive); |
1051 | #endif | 1051 | #endif |
1052 | } | 1052 | } |
1053 | 1053 | ||