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/hpt366.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/hpt366.c')
-rw-r--r-- | drivers/ide/pci/hpt366.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c index 992b60eeee3f..8cb6b74f0148 100644 --- a/drivers/ide/pci/hpt366.c +++ b/drivers/ide/pci/hpt366.c | |||
@@ -713,16 +713,6 @@ static void hpt3xx_maskproc(ide_drive_t *drive, int mask) | |||
713 | IDE_CONTROL_REG); | 713 | IDE_CONTROL_REG); |
714 | } | 714 | } |
715 | 715 | ||
716 | static int hpt366_config_drive_xfer_rate(ide_drive_t *drive) | ||
717 | { | ||
718 | if (ide_tune_dma(drive)) | ||
719 | return 0; | ||
720 | |||
721 | ide_set_max_pio(drive); | ||
722 | |||
723 | return -1; | ||
724 | } | ||
725 | |||
726 | /* | 716 | /* |
727 | * This is specific to the HPT366 UDMA chipset | 717 | * This is specific to the HPT366 UDMA chipset |
728 | * by HighPoint|Triones Technologies, Inc. | 718 | * by HighPoint|Triones Technologies, Inc. |
@@ -1346,8 +1336,6 @@ static void __devinit init_hwif_hpt366(ide_hwif_t *hwif) | |||
1346 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 1336 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
1347 | hwif->cbl = (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80; | 1337 | hwif->cbl = (scr1 & ata66) ? ATA_CBL_PATA40 : ATA_CBL_PATA80; |
1348 | 1338 | ||
1349 | hwif->ide_dma_check = &hpt366_config_drive_xfer_rate; | ||
1350 | |||
1351 | if (chip_type >= HPT374) { | 1339 | if (chip_type >= HPT374) { |
1352 | hwif->ide_dma_test_irq = &hpt374_ide_dma_test_irq; | 1340 | hwif->ide_dma_test_irq = &hpt374_ide_dma_test_irq; |
1353 | hwif->ide_dma_end = &hpt374_ide_dma_end; | 1341 | hwif->ide_dma_end = &hpt374_ide_dma_end; |