1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/ide/pci/siimage.c b/drivers/ide/pci/siimage.c
index ad98510026a5..367733c8c1de 100644
--- a/drivers/ide/pci/siimage.c
+++ b/drivers/ide/pci/siimage.c
@@ -415,19 +415,11 @@ static int config_chipset_for_dma (ide_drive_t *drive)
 static int siimage_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) && config_chipset_for_dma(drive))
+                return hwif->ide_dma_on(drive);
 
-                if (ide_use_dma(drive)) {
-                        if (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_fast_pio(drive)) {
                 config_chipset_for_pio(drive, 1);
                 return hwif->ide_dma_off_quietly(drive);
         }