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/serverworks.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/serverworks.c')
-rw-r--r-- | drivers/ide/pci/serverworks.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/serverworks.c b/drivers/ide/pci/serverworks.c index 4666e4c1597b..c0d82d290587 100644 --- a/drivers/ide/pci/serverworks.c +++ b/drivers/ide/pci/serverworks.c | |||
@@ -196,16 +196,6 @@ static void svwks_set_dma_mode(ide_drive_t *drive, const u8 speed) | |||
196 | pci_write_config_byte(dev, 0x54, ultra_enable); | 196 | pci_write_config_byte(dev, 0x54, ultra_enable); |
197 | } | 197 | } |
198 | 198 | ||
199 | static int svwks_config_drive_xfer_rate (ide_drive_t *drive) | ||
200 | { | ||
201 | if (ide_tune_dma(drive)) | ||
202 | return 0; | ||
203 | |||
204 | ide_set_max_pio(drive); | ||
205 | |||
206 | return -1; | ||
207 | } | ||
208 | |||
209 | static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const char *name) | 199 | static unsigned int __devinit init_chipset_svwks (struct pci_dev *dev, const char *name) |
210 | { | 200 | { |
211 | unsigned int reg; | 201 | unsigned int reg; |
@@ -392,7 +382,6 @@ static void __devinit init_hwif_svwks (ide_hwif_t *hwif) | |||
392 | if (!hwif->dma_base) | 382 | if (!hwif->dma_base) |
393 | return; | 383 | return; |
394 | 384 | ||
395 | hwif->ide_dma_check = &svwks_config_drive_xfer_rate; | ||
396 | if (hwif->pci_dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) { | 385 | if (hwif->pci_dev->device != PCI_DEVICE_ID_SERVERWORKS_OSB4IDE) { |
397 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) | 386 | if (hwif->cbl != ATA_CBL_PATA40_SHORT) |
398 | hwif->cbl = ata66_svwks(hwif); | 387 | hwif->cbl = ata66_svwks(hwif); |