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/via82cxxx.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/via82cxxx.c')
-rw-r--r-- | drivers/ide/pci/via82cxxx.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 479e49661032..c199f88c420f 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
@@ -197,24 +197,6 @@ static void via_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
197 | via_set_drive(drive, XFER_PIO_0 + pio); | 197 | via_set_drive(drive, XFER_PIO_0 + pio); |
198 | } | 198 | } |
199 | 199 | ||
200 | /** | ||
201 | * via82cxxx_ide_dma_check - set up for DMA if possible | ||
202 | * @drive: IDE drive to set up | ||
203 | * | ||
204 | * Set up the drive for the highest supported speed considering the | ||
205 | * driver, controller and cable | ||
206 | */ | ||
207 | |||
208 | static int via82cxxx_ide_dma_check (ide_drive_t *drive) | ||
209 | { | ||
210 | if (ide_tune_dma(drive)) | ||
211 | return 0; | ||
212 | |||
213 | ide_set_max_pio(drive); | ||
214 | |||
215 | return -1; | ||
216 | } | ||
217 | |||
218 | static struct via_isa_bridge *via_config_find(struct pci_dev **isa) | 200 | static struct via_isa_bridge *via_config_find(struct pci_dev **isa) |
219 | { | 201 | { |
220 | struct via_isa_bridge *via_config; | 202 | struct via_isa_bridge *via_config; |
@@ -473,7 +455,6 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif) | |||
473 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 455 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
474 | hwif->cbl = via82cxxx_cable_detect(hwif); | 456 | hwif->cbl = via82cxxx_cable_detect(hwif); |
475 | 457 | ||
476 | hwif->ide_dma_check = &via82cxxx_ide_dma_check; | ||
477 | if (!noautodma) | 458 | if (!noautodma) |
478 | hwif->autodma = 1; | 459 | hwif->autodma = 1; |
479 | hwif->drives[0].autodma = hwif->autodma; | 460 | hwif->drives[0].autodma = hwif->autodma; |