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/cris | |
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/cris')
-rw-r--r-- | drivers/ide/cris/ide-cris.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/cris/ide-cris.c b/drivers/ide/cris/ide-cris.c index 24281176b4dc..027341d66b28 100644 --- a/drivers/ide/cris/ide-cris.c +++ b/drivers/ide/cris/ide-cris.c | |||
@@ -1048,12 +1048,10 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive) | |||
1048 | 1048 | ||
1049 | static int cris_dma_check(ide_drive_t *drive) | 1049 | static int cris_dma_check(ide_drive_t *drive) |
1050 | { | 1050 | { |
1051 | ide_hwif_t *hwif = drive->hwif; | ||
1052 | |||
1053 | if (ide_use_dma(drive) && cris_config_drive_for_dma(drive)) | 1051 | if (ide_use_dma(drive) && cris_config_drive_for_dma(drive)) |
1054 | return hwif->ide_dma_on(drive); | 1052 | return 0; |
1055 | 1053 | ||
1056 | return hwif->ide_dma_off_quietly(drive); | 1054 | return -1; |
1057 | } | 1055 | } |
1058 | 1056 | ||
1059 | static int cris_dma_end(ide_drive_t *drive) | 1057 | static int cris_dma_end(ide_drive_t *drive) |