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.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.c')
-rw-r--r-- | drivers/ide/ide.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 5c0e4078b5cb..4834cca5cb31 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -418,7 +418,6 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) | |||
418 | hwif->dma_exec_cmd = tmp_hwif->dma_exec_cmd; | 418 | hwif->dma_exec_cmd = tmp_hwif->dma_exec_cmd; |
419 | hwif->dma_start = tmp_hwif->dma_start; | 419 | hwif->dma_start = tmp_hwif->dma_start; |
420 | hwif->ide_dma_end = tmp_hwif->ide_dma_end; | 420 | hwif->ide_dma_end = tmp_hwif->ide_dma_end; |
421 | hwif->ide_dma_check = tmp_hwif->ide_dma_check; | ||
422 | hwif->ide_dma_on = tmp_hwif->ide_dma_on; | 421 | hwif->ide_dma_on = tmp_hwif->ide_dma_on; |
423 | hwif->dma_off_quietly = tmp_hwif->dma_off_quietly; | 422 | hwif->dma_off_quietly = tmp_hwif->dma_off_quietly; |
424 | hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq; | 423 | hwif->ide_dma_test_irq = tmp_hwif->ide_dma_test_irq; |
@@ -823,7 +822,7 @@ int set_using_dma(ide_drive_t *drive, int arg) | |||
823 | if (!drive->id || !(drive->id->capability & 1)) | 822 | if (!drive->id || !(drive->id->capability & 1)) |
824 | goto out; | 823 | goto out; |
825 | 824 | ||
826 | if (hwif->ide_dma_check == NULL) | 825 | if (hwif->ide_dma_on == NULL) |
827 | goto out; | 826 | goto out; |
828 | 827 | ||
829 | err = -EBUSY; | 828 | err = -EBUSY; |