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/amd74xx.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/amd74xx.c')
-rw-r--r-- | drivers/ide/pci/amd74xx.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c index 6ff4089a2379..6fa5b3f87b8f 100644 --- a/drivers/ide/pci/amd74xx.c +++ b/drivers/ide/pci/amd74xx.c | |||
@@ -264,16 +264,6 @@ static void amd_set_pio_mode(ide_drive_t *drive, const u8 pio) | |||
264 | amd_set_drive(drive, XFER_PIO_0 + pio); | 264 | amd_set_drive(drive, XFER_PIO_0 + pio); |
265 | } | 265 | } |
266 | 266 | ||
267 | static int amd74xx_ide_dma_check(ide_drive_t *drive) | ||
268 | { | ||
269 | if (ide_tune_dma(drive)) | ||
270 | return 0; | ||
271 | |||
272 | ide_set_max_pio(drive); | ||
273 | |||
274 | return -1; | ||
275 | } | ||
276 | |||
277 | /* | 267 | /* |
278 | * The initialization callback. Here we determine the IDE chip type | 268 | * The initialization callback. Here we determine the IDE chip type |
279 | * and initialize its drive independent registers. | 269 | * and initialize its drive independent registers. |
@@ -415,7 +405,6 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) | |||
415 | hwif->cbl = ATA_CBL_PATA40; | 405 | hwif->cbl = ATA_CBL_PATA40; |
416 | } | 406 | } |
417 | 407 | ||
418 | hwif->ide_dma_check = &amd74xx_ide_dma_check; | ||
419 | if (!noautodma) | 408 | if (!noautodma) |
420 | hwif->autodma = 1; | 409 | hwif->autodma = 1; |
421 | hwif->drives[0].autodma = hwif->autodma; | 410 | hwif->drives[0].autodma = hwif->autodma; |