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/cs5535.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/cs5535.c')
-rw-r--r-- | drivers/ide/pci/cs5535.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ide/pci/cs5535.c b/drivers/ide/pci/cs5535.c index cd7c4190ad6e..45f43efbf92c 100644 --- a/drivers/ide/pci/cs5535.c +++ b/drivers/ide/pci/cs5535.c | |||
@@ -195,20 +195,19 @@ static int cs5535_config_drive_for_dma(ide_drive_t *drive) | |||
195 | 195 | ||
196 | static int cs5535_dma_check(ide_drive_t *drive) | 196 | static int cs5535_dma_check(ide_drive_t *drive) |
197 | { | 197 | { |
198 | ide_hwif_t *hwif = drive->hwif; | ||
199 | u8 speed; | 198 | u8 speed; |
200 | 199 | ||
201 | drive->init_speed = 0; | 200 | drive->init_speed = 0; |
202 | 201 | ||
203 | if (ide_use_dma(drive) && cs5535_config_drive_for_dma(drive)) | 202 | if (ide_use_dma(drive) && cs5535_config_drive_for_dma(drive)) |
204 | return hwif->ide_dma_on(drive); | 203 | return 0; |
205 | 204 | ||
206 | if (ide_use_fast_pio(drive)) { | 205 | if (ide_use_fast_pio(drive)) { |
207 | speed = ide_get_best_pio_mode(drive, 255, 4, NULL); | 206 | speed = ide_get_best_pio_mode(drive, 255, 4, NULL); |
208 | cs5535_set_drive(drive, speed); | 207 | cs5535_set_drive(drive, speed); |
209 | } | 208 | } |
210 | 209 | ||
211 | return hwif->ide_dma_off_quietly(drive); | 210 | return -1; |
212 | } | 211 | } |
213 | 212 | ||
214 | static u8 __devinit cs5535_cable_detect(struct pci_dev *dev) | 213 | static u8 __devinit cs5535_cable_detect(struct pci_dev *dev) |