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/mips | |
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/mips')
-rw-r--r-- | drivers/ide/mips/au1xxx-ide.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 1c4732958fb2..cd00081fb278 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -380,16 +380,6 @@ static u8 auide_mdma_filter(ide_drive_t *drive) | |||
380 | return drive->hwif->mwdma_mask; | 380 | return drive->hwif->mwdma_mask; |
381 | } | 381 | } |
382 | 382 | ||
383 | static int auide_dma_check(ide_drive_t *drive) | ||
384 | { | ||
385 | if (ide_tune_dma(drive)) | ||
386 | return 0; | ||
387 | |||
388 | ide_set_max_pio(drive); | ||
389 | |||
390 | return -1; | ||
391 | } | ||
392 | |||
393 | static int auide_dma_test_irq(ide_drive_t *drive) | 383 | static int auide_dma_test_irq(ide_drive_t *drive) |
394 | { | 384 | { |
395 | if (drive->waiting_for_dma == 0) | 385 | if (drive->waiting_for_dma == 0) |
@@ -700,7 +690,6 @@ static int au_ide_probe(struct device *dev) | |||
700 | 690 | ||
701 | hwif->mdma_filter = &auide_mdma_filter; | 691 | hwif->mdma_filter = &auide_mdma_filter; |
702 | 692 | ||
703 | hwif->ide_dma_check = &auide_dma_check; | ||
704 | hwif->dma_exec_cmd = &auide_dma_exec_cmd; | 693 | hwif->dma_exec_cmd = &auide_dma_exec_cmd; |
705 | hwif->dma_start = &auide_dma_start; | 694 | hwif->dma_start = &auide_dma_start; |
706 | hwif->ide_dma_end = &auide_dma_end; | 695 | hwif->ide_dma_end = &auide_dma_end; |