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/pci/it821x.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/pci/it821x.c')
-rw-r--r-- | drivers/ide/pci/it821x.c | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/ide/pci/it821x.c b/drivers/ide/pci/it821x.c index 1b69d82478c6..25595acc299f 100644 --- a/drivers/ide/pci/it821x.c +++ b/drivers/ide/pci/it821x.c | |||
@@ -416,26 +416,6 @@ static void it821x_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
416 | } | 416 | } |
417 | 417 | ||
418 | /** | 418 | /** |
419 | * it821x_configure_drive_for_dma - set up for DMA transfers | ||
420 | * @drive: drive we are going to set up | ||
421 | * | ||
422 | * Set up the drive for DMA, tune the controller and drive as | ||
423 | * required. If the drive isn't suitable for DMA or we hit | ||
424 | * other problems then we will drop down to PIO and set up | ||
425 | * PIO appropriately | ||
426 | */ | ||
427 | |||
428 | static int it821x_config_drive_for_dma (ide_drive_t *drive) | ||
429 | { | ||
430 | if (ide_tune_dma(drive)) | ||
431 | return 0; | ||
432 | |||
433 | ide_set_max_pio(drive); | ||
434 | |||
435 | return -1; | ||
436 | } | ||
437 | |||
438 | /** | ||
439 | * ata66_it821x - check for 80 pin cable | 419 | * ata66_it821x - check for 80 pin cable |
440 | * @hwif: interface to check | 420 | * @hwif: interface to check |
441 | * | 421 | * |
@@ -615,8 +595,6 @@ static void __devinit init_hwif_it821x(ide_hwif_t *hwif) | |||
615 | hwif->ultra_mask = 0x7f; | 595 | hwif->ultra_mask = 0x7f; |
616 | hwif->mwdma_mask = 0x07; | 596 | hwif->mwdma_mask = 0x07; |
617 | 597 | ||
618 | hwif->ide_dma_check = &it821x_config_drive_for_dma; | ||
619 | |||
620 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 598 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
621 | hwif->cbl = ata66_it821x(hwif); | 599 | hwif->cbl = ata66_it821x(hwif); |
622 | 600 | ||