aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/ide-iops.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r--drivers/ide/ide-iops.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index e3e5e39f4906..76cb5f2bd4e6 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -742,7 +742,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
742// msleep(50); 742// msleep(50);
743 743
744#ifdef CONFIG_BLK_DEV_IDEDMA 744#ifdef CONFIG_BLK_DEV_IDEDMA
745 if (hwif->ide_dma_on) /* check if host supports DMA */ 745 if (hwif->dma_host_on) /* check if host supports DMA */
746 hwif->dma_host_off(drive); 746 hwif->dma_host_off(drive);
747#endif 747#endif
748 748
@@ -801,8 +801,8 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed)
801#ifdef CONFIG_BLK_DEV_IDEDMA 801#ifdef CONFIG_BLK_DEV_IDEDMA
802 if (speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA)) 802 if (speed >= XFER_SW_DMA_0 || (hwif->host_flags & IDE_HFLAG_VDMA))
803 hwif->dma_host_on(drive); 803 hwif->dma_host_on(drive);
804 else if (hwif->ide_dma_on) /* check if host supports DMA */ 804 else if (hwif->dma_host_on) /* check if host supports DMA */
805 hwif->dma_off_quietly(drive); 805 ide_dma_off_quietly(drive);
806#endif 806#endif
807 807
808 switch(speed) { 808 switch(speed) {
@@ -1012,10 +1012,10 @@ static void check_dma_crc(ide_drive_t *drive)
1012{ 1012{
1013#ifdef CONFIG_BLK_DEV_IDEDMA 1013#ifdef CONFIG_BLK_DEV_IDEDMA
1014 if (drive->crc_count) { 1014 if (drive->crc_count) {
1015 drive->hwif->dma_off_quietly(drive); 1015 ide_dma_off_quietly(drive);
1016 ide_set_xfer_rate(drive, ide_auto_reduce_xfer(drive)); 1016 ide_set_xfer_rate(drive, ide_auto_reduce_xfer(drive));
1017 if (drive->current_speed >= XFER_SW_DMA_0) 1017 if (drive->current_speed >= XFER_SW_DMA_0)
1018 (void) HWIF(drive)->ide_dma_on(drive); 1018 ide_dma_on(drive);
1019 } else 1019 } else
1020 ide_dma_off(drive); 1020 ide_dma_off(drive);
1021#endif 1021#endif