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/aec62xx.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/aec62xx.c')
-rw-r--r-- | drivers/ide/pci/aec62xx.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/aec62xx.c b/drivers/ide/pci/aec62xx.c index 91bf5beba5ce..97b39cebe63a 100644 --- a/drivers/ide/pci/aec62xx.c +++ b/drivers/ide/pci/aec62xx.c | |||
@@ -141,16 +141,6 @@ static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
141 | drive->hwif->set_dma_mode(drive, pio + XFER_PIO_0); | 141 | drive->hwif->set_dma_mode(drive, pio + XFER_PIO_0); |
142 | } | 142 | } |
143 | 143 | ||
144 | static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive) | ||
145 | { | ||
146 | if (ide_tune_dma(drive)) | ||
147 | return 0; | ||
148 | |||
149 | ide_set_max_pio(drive); | ||
150 | |||
151 | return -1; | ||
152 | } | ||
153 | |||
154 | static void aec62xx_dma_lost_irq (ide_drive_t *drive) | 144 | static void aec62xx_dma_lost_irq (ide_drive_t *drive) |
155 | { | 145 | { |
156 | switch (HWIF(drive)->pci_dev->device) { | 146 | switch (HWIF(drive)->pci_dev->device) { |
@@ -214,7 +204,6 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif) | |||
214 | hwif->ultra_mask = hwif->cds->udma_mask; | 204 | hwif->ultra_mask = hwif->cds->udma_mask; |
215 | hwif->mwdma_mask = 0x07; | 205 | hwif->mwdma_mask = 0x07; |
216 | 206 | ||
217 | hwif->ide_dma_check = &aec62xx_config_drive_xfer_rate; | ||
218 | hwif->dma_lost_irq = &aec62xx_dma_lost_irq; | 207 | hwif->dma_lost_irq = &aec62xx_dma_lost_irq; |
219 | 208 | ||
220 | if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) { | 209 | if (dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) { |