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/pdc202xx_old.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/pdc202xx_old.c')
-rw-r--r-- | drivers/ide/pci/pdc202xx_old.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/pdc202xx_old.c b/drivers/ide/pci/pdc202xx_old.c index b2c7b6e3edd5..4efc758c7638 100644 --- a/drivers/ide/pci/pdc202xx_old.c +++ b/drivers/ide/pci/pdc202xx_old.c | |||
@@ -179,16 +179,6 @@ static void pdc_old_disable_66MHz_clock(ide_hwif_t *hwif) | |||
179 | outb(clock & ~(hwif->channel ? 0x08 : 0x02), clock_reg); | 179 | outb(clock & ~(hwif->channel ? 0x08 : 0x02), clock_reg); |
180 | } | 180 | } |
181 | 181 | ||
182 | static int pdc202xx_config_drive_xfer_rate (ide_drive_t *drive) | ||
183 | { | ||
184 | if (ide_tune_dma(drive)) | ||
185 | return 0; | ||
186 | |||
187 | ide_set_max_pio(drive); | ||
188 | |||
189 | return -1; | ||
190 | } | ||
191 | |||
192 | static int pdc202xx_quirkproc (ide_drive_t *drive) | 182 | static int pdc202xx_quirkproc (ide_drive_t *drive) |
193 | { | 183 | { |
194 | const char **list, *model = drive->id->model; | 184 | const char **list, *model = drive->id->model; |
@@ -344,7 +334,6 @@ static void __devinit init_hwif_pdc202xx(ide_hwif_t *hwif) | |||
344 | hwif->swdma_mask = 0x07; | 334 | hwif->swdma_mask = 0x07; |
345 | hwif->atapi_dma = 1; | 335 | hwif->atapi_dma = 1; |
346 | 336 | ||
347 | hwif->ide_dma_check = &pdc202xx_config_drive_xfer_rate; | ||
348 | hwif->dma_lost_irq = &pdc202xx_dma_lost_irq; | 337 | hwif->dma_lost_irq = &pdc202xx_dma_lost_irq; |
349 | hwif->dma_timeout = &pdc202xx_dma_timeout; | 338 | hwif->dma_timeout = &pdc202xx_dma_timeout; |
350 | 339 | ||