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/hpt34x.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/hpt34x.c')
-rw-r--r-- | drivers/ide/pci/hpt34x.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/hpt34x.c b/drivers/ide/pci/hpt34x.c index c65971d8d6ad..924eaa3a5708 100644 --- a/drivers/ide/pci/hpt34x.c +++ b/drivers/ide/pci/hpt34x.c | |||
@@ -109,21 +109,19 @@ static int config_chipset_for_dma (ide_drive_t *drive) | |||
109 | 109 | ||
110 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) | 110 | static int hpt34x_config_drive_xfer_rate (ide_drive_t *drive) |
111 | { | 111 | { |
112 | ide_hwif_t *hwif = HWIF(drive); | ||
113 | |||
114 | drive->init_speed = 0; | 112 | drive->init_speed = 0; |
115 | 113 | ||
116 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | 114 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) |
117 | #ifndef CONFIG_HPT34X_AUTODMA | 115 | #ifndef CONFIG_HPT34X_AUTODMA |
118 | return hwif->ide_dma_off_quietly(drive); | 116 | return -1; |
119 | #else | 117 | #else |
120 | return hwif->ide_dma_on(drive); | 118 | return 0; |
121 | #endif | 119 | #endif |
122 | 120 | ||
123 | if (ide_use_fast_pio(drive)) | 121 | if (ide_use_fast_pio(drive)) |
124 | hpt34x_tune_drive(drive, 255); | 122 | hpt34x_tune_drive(drive, 255); |
125 | 123 | ||
126 | return hwif->ide_dma_off_quietly(drive); | 124 | return -1; |
127 | } | 125 | } |
128 | 126 | ||
129 | /* | 127 | /* |