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/sis5513.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/sis5513.c')
-rw-r--r-- | drivers/ide/pci/sis5513.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/ide/pci/sis5513.c b/drivers/ide/pci/sis5513.c index 53ffeced06ff..2ba0669f36a1 100644 --- a/drivers/ide/pci/sis5513.c +++ b/drivers/ide/pci/sis5513.c | |||
@@ -669,19 +669,17 @@ static int config_chipset_for_dma (ide_drive_t *drive) | |||
669 | 669 | ||
670 | static int sis5513_config_xfer_rate(ide_drive_t *drive) | 670 | static int sis5513_config_xfer_rate(ide_drive_t *drive) |
671 | { | 671 | { |
672 | ide_hwif_t *hwif = HWIF(drive); | ||
673 | |||
674 | config_art_rwp_pio(drive, 5); | 672 | config_art_rwp_pio(drive, 5); |
675 | 673 | ||
676 | drive->init_speed = 0; | 674 | drive->init_speed = 0; |
677 | 675 | ||
678 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) | 676 | if (ide_use_dma(drive) && config_chipset_for_dma(drive)) |
679 | return hwif->ide_dma_on(drive); | 677 | return 0; |
680 | 678 | ||
681 | if (ide_use_fast_pio(drive)) | 679 | if (ide_use_fast_pio(drive)) |
682 | sis5513_tune_drive(drive, 5); | 680 | sis5513_tune_drive(drive, 5); |
683 | 681 | ||
684 | return hwif->ide_dma_off_quietly(drive); | 682 | return -1; |
685 | } | 683 | } |
686 | 684 | ||
687 | /* Chip detection and general config */ | 685 | /* Chip detection and general config */ |