diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:26 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:26 -0500 |
commit | 3608b5d71a52c053787dbad6af20c25f7e0b75a9 (patch) | |
tree | 5bd6ac777d32d8426e65e3c31cc1587674771e8c /drivers/ide/pci/cmd64x.c | |
parent | 9ef5791e1be91007951477b8ed1530ac1166a8e7 (diff) |
ide: add ide_set_dma() helper (v2)
* add ide_set_dma() helper and make ide_hwif_t.ide_dma_check return
-1 when DMA needs to be disabled (== need to call ->ide_dma_off_quietly)
0 when DMA needs to be enabled (== need to call ->ide_dma_on)
1 when DMA setting shouldn't be changed
* fix IDE code to use ide_set_dma() instead if using ->ide_dma_check directly
v2:
* updated for scc_pata
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/cmd64x.c')
-rw-r--r-- | drivers/ide/pci/cmd64x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/pci/cmd64x.c b/drivers/ide/pci/cmd64x.c index 28f580886693..49df27513da7 100644 --- a/drivers/ide/pci/cmd64x.c +++ b/drivers/ide/pci/cmd64x.c | |||
@@ -474,15 +474,13 @@ static int config_chipset_for_dma (ide_drive_t *drive) | |||
474 | 474 | ||
475 | static int cmd64x_config_drive_for_dma (ide_drive_t *drive) | 475 | static int cmd64x_config_drive_for_dma (ide_drive_t *drive) |
476 | { | 476 | { |
477 | ide_hwif_t *hwif = HWIF(drive); | ||
478 | |||
479 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | 477 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) |
480 | return hwif->ide_dma_on(drive); | 478 | return 0; |
481 | 479 | ||
482 | if (ide_use_fast_pio(drive)) | 480 | if (ide_use_fast_pio(drive)) |
483 | config_chipset_for_pio(drive, 1); | 481 | config_chipset_for_pio(drive, 1); |
484 | 482 | ||
485 | return hwif->ide_dma_off_quietly(drive); | 483 | return -1; |
486 | } | 484 | } |
487 | 485 | ||
488 | static int cmd64x_alt_dma_status (struct pci_dev *dev) | 486 | static int cmd64x_alt_dma_status (struct pci_dev *dev) |