diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:55 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-16 16:29:55 -0400 |
commit | 0ae2e178652753ae1797d407755a3505f7c1d2a7 (patch) | |
tree | fa725edcfb4b9752ebf2aa49a3e42e158537d4ed /drivers/ide/ide-iops.c | |
parent | b8b739d3361c16773a30fe5c0360336bbc19f435 (diff) |
ide: remove ->ide_dma_check (take 2)
* Add IDE_HFLAG_TRUST_BIOS_FOR_DMA host flag for host drivers that depend
on BIOS for programming device/controller for DMA. Set it in cy82c693,
generic, ns87415, opti621 and trm290 host drivers.
* Add IDE_HFLAG_VDMA host flag for host drivers using VDMA. Set it in cs5520
host driver.
* Teach ide_tune_dma() about IDE_HFLAG_TRUST_BIOS_FOR_DMA flag.
* Add generic ide_dma_check() helper and remove all open coded ->ide_dma_check
implementations. Fix all places checking for presence of ->ide_dma_check
hook to check for ->ide_dma_on instead.
* Remove no longer needed code from config_drive_for_dma().
* Make ide_tune_dma() static.
v2:
* Fix config_drive_for_dma() return values.
* Fix ide-dma.c build for CONFIG_BLK_DEV_IDEDMA_PCI=n by adding
dummy config_drive_for_dma() inline.
* Fix IDE_HFLAG_TRUST_BIOS_FOR_DMA handling in ide_dma_check().
* Fix init_hwif_it8213() comment.
There should be no functionality changes caused by this patch.
Cc: 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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index aa738833bed5..d4d790f91f91 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -776,7 +776,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) | |||
776 | // msleep(50); | 776 | // msleep(50); |
777 | 777 | ||
778 | #ifdef CONFIG_BLK_DEV_IDEDMA | 778 | #ifdef CONFIG_BLK_DEV_IDEDMA |
779 | if (hwif->ide_dma_check) /* check if host supports DMA */ | 779 | if (hwif->ide_dma_on) /* check if host supports DMA */ |
780 | hwif->dma_host_off(drive); | 780 | hwif->dma_host_off(drive); |
781 | #endif | 781 | #endif |
782 | 782 | ||
@@ -830,7 +830,7 @@ int ide_config_drive_speed(ide_drive_t *drive, u8 speed) | |||
830 | #ifdef CONFIG_BLK_DEV_IDEDMA | 830 | #ifdef CONFIG_BLK_DEV_IDEDMA |
831 | if (speed >= XFER_SW_DMA_0) | 831 | if (speed >= XFER_SW_DMA_0) |
832 | hwif->dma_host_on(drive); | 832 | hwif->dma_host_on(drive); |
833 | else if (hwif->ide_dma_check) /* check if host supports DMA */ | 833 | else if (hwif->ide_dma_on) /* check if host supports DMA */ |
834 | hwif->dma_off_quietly(drive); | 834 | hwif->dma_off_quietly(drive); |
835 | #endif | 835 | #endif |
836 | 836 | ||