aboutsummaryrefslogtreecommitdiff
path: root/drivers/ide/ppc/scc_pata.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ide/ppc/scc_pata.c')
-rw-r--r--drivers/ide/ppc/scc_pata.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/ide/ppc/scc_pata.c b/drivers/ide/ppc/scc_pata.c
index 65ad8ab3459..0ab26ea5a35 100644
--- a/drivers/ide/ppc/scc_pata.c
+++ b/drivers/ide/ppc/scc_pata.c
@@ -383,16 +383,11 @@ static int scc_config_chipset_for_dma(ide_drive_t *drive)
static int scc_config_drive_for_dma(ide_drive_t *drive)
{
ide_hwif_t *hwif = HWIF(drive);
- struct hd_driveid *id = drive->id;
- if ((id->capability & 1) != 0 && drive->autodma) {
- if (ide_use_dma(drive)) {
- if (scc_config_chipset_for_dma(drive))
- return hwif->ide_dma_on(drive);
- }
- goto fast_ata_pio;
- } else if ((id->capability & 8) || (id->field_valid & 2)) {
- fast_ata_pio:
+ if (ide_use_dma(drive) && scc_config_chipset_for_dma(drive))
+ return hwif->ide_dma_on(drive);
+
+ if (ide_use_fast_pio(drive)) {
hwif->tuneproc(drive, 4);
hwif->ide_dma_off_quietly(drive);
}