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/slc90e66.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/slc90e66.c')
-rw-r--r-- | drivers/ide/pci/slc90e66.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/ide/pci/slc90e66.c b/drivers/ide/pci/slc90e66.c index 917cc8e61e47..ae7eb58d961c 100644 --- a/drivers/ide/pci/slc90e66.c +++ b/drivers/ide/pci/slc90e66.c | |||
@@ -179,18 +179,16 @@ static int slc90e66_config_drive_for_dma (ide_drive_t *drive) | |||
179 | 179 | ||
180 | static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive) | 180 | static int slc90e66_config_drive_xfer_rate (ide_drive_t *drive) |
181 | { | 181 | { |
182 | ide_hwif_t *hwif = HWIF(drive); | ||
183 | |||
184 | drive->init_speed = 0; | 182 | drive->init_speed = 0; |
185 | 183 | ||
186 | if (ide_use_dma(drive) && slc90e66_config_drive_for_dma(drive)) | 184 | if (ide_use_dma(drive) && slc90e66_config_drive_for_dma(drive)) |
187 | return hwif->ide_dma_on(drive); | 185 | return 0; |
188 | 186 | ||
189 | if (ide_use_fast_pio(drive)) | 187 | if (ide_use_fast_pio(drive)) |
190 | (void) hwif->speedproc(drive, XFER_PIO_0 + | 188 | (void)slc90e66_tune_chipset(drive, XFER_PIO_0 + |
191 | ide_get_best_pio_mode(drive, 255, 4, NULL)); | 189 | ide_get_best_pio_mode(drive, 255, 4, NULL)); |
192 | 190 | ||
193 | return hwif->ide_dma_off_quietly(drive); | 191 | return -1; |
194 | } | 192 | } |
195 | 193 | ||
196 | static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) | 194 | static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) |