diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-02-16 20:40:25 -0500 |
commit | 7569e8dc2213ecc47024ea5edbadc8736487d926 (patch) | |
tree | 44c47e85b5e87c75972c077da31f198c4f597688 /drivers/ide/pci/triflex.c | |
parent | 056a697b7388844a1341e92e277bff8e5bf61ec9 (diff) |
ide: add ide_use_fast_pio() helper (v3)
* add ide_use_fast_pio() helper for use by host drivers
* add DMA capability and hwif->autodma checks to ide_use_dma()
- au1xxx-ide/it8213/it821x drivers didn't check for (id->capability & 1)
[ for the IT8211/2 in SMART mode this check shouldn't be made but since
in it821x_fixups() we set DMA bit explicitly:
if(strstr(id->model, "Integrated Technology Express")) {
/* In raid mode the ident block is slightly buggy
We need to set the bits so that the IDE layer knows
LBA28. LBA48 and DMA ar valid */
id->capability |= 3; /* LBA28, DMA */
we are better off using generic helper if we can ]
- ide-cris driver didn't set ->autodma
[ before the patch hwif->autodma was only checked in the chipset specific
hwif->ide_dma_check implementations, for ide-cris it is cris_dma_check()
function so there no behavior change here ]
v2:
* updated patch description (thanks to Alan Cox for the feedback)
v3:
* updated for scc_pata driver
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/pci/triflex.c')
-rw-r--r-- | drivers/ide/pci/triflex.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c index b0d29cd7123a..1f5f6759fef8 100644 --- a/drivers/ide/pci/triflex.c +++ b/drivers/ide/pci/triflex.c | |||
@@ -114,14 +114,9 @@ static int triflex_config_drive_for_dma(ide_drive_t *drive) | |||
114 | static int triflex_config_drive_xfer_rate(ide_drive_t *drive) | 114 | static int triflex_config_drive_xfer_rate(ide_drive_t *drive) |
115 | { | 115 | { |
116 | ide_hwif_t *hwif = HWIF(drive); | 116 | ide_hwif_t *hwif = HWIF(drive); |
117 | struct hd_driveid *id = drive->id; | ||
118 | 117 | ||
119 | if ((id->capability & 1) && drive->autodma) { | 118 | if (ide_use_dma(drive) && triflex_config_drive_for_dma(drive)) |
120 | if (ide_use_dma(drive)) { | 119 | return hwif->ide_dma_on(drive); |
121 | if (triflex_config_drive_for_dma(drive)) | ||
122 | return hwif->ide_dma_on(drive); | ||
123 | } | ||
124 | } | ||
125 | 120 | ||
126 | hwif->tuneproc(drive, 255); | 121 | hwif->tuneproc(drive, 255); |
127 | return hwif->ide_dma_off_quietly(drive); | 122 | return hwif->ide_dma_off_quietly(drive); |