1 files changed, 8 insertions, 12 deletions

diff --git a/drivers/ide/pci/amd74xx.c b/drivers/ide/pci/amd74xx.c
index 71d2c670e97e..6ff4089a2379 100644
--- a/drivers/ide/pci/amd74xx.c
+++ b/drivers/ide/pci/amd74xx.c
@@ -229,20 +229,16 @@ static void amd_set_speed(struct pci_dev *dev, unsigned char dn, struct ide_timi
 }
 
 /*
- * amd_set_drive() computes timing values configures the drive and
- * the chipset to a desired transfer mode. It also can be called
- * by upper layers.
+ * amd_set_drive() computes timing values and configures the chipset
+ * to a desired transfer mode.  It also can be called by upper layers.
  */
 
-static int amd_set_drive(ide_drive_t *drive, const u8 speed)
+static void amd_set_drive(ide_drive_t *drive, const u8 speed)
 {
         ide_drive_t *peer = HWIF(drive)->drives + (~drive->dn & 1);
         struct ide_timing t, p;
         int T, UT;
 
-        if (ide_config_drive_speed(drive, speed))
-                return 1;
-
         T = 1000000000 / amd_clock;
         UT = (amd_config->udma_mask == ATA_UDMA2) ? T : (T / 2);
 
@@ -257,8 +253,6 @@ static int amd_set_drive(ide_drive_t *drive, const u8 speed)
         if (speed == XFER_UDMA_6 && amd_clock <= 33333) t.udma = 15;
 
         amd_set_speed(HWIF(drive)->pci_dev, drive->dn, &t);
-
-        return 0;
 }
 
 /*
@@ -395,7 +389,7 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
         hwif->autodma = 0;
 
         hwif->set_pio_mode = &amd_set_pio_mode;
-        hwif->speedproc = &amd_set_drive;
+        hwif->set_dma_mode = &amd_set_drive;
 
         for (i = 0; i < 2; i++) {
                 hwif->drives[i].io_32bit = 1;
@@ -437,7 +431,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 .enablebits     = {{0x40,0x02,0x02}, {0x40,0x01,0x01}}, \
                 .bootable       = ON_BOARD,                             \
                 .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST            \
-                                | IDE_HFLAG_PIO_NO_DOWNGRADE,           \
+                                | IDE_HFLAG_PIO_NO_DOWNGRADE            \
+                                | IDE_HFLAG_POST_SET_MODE,              \
                 .pio_mask       = ATA_PIO5,                             \
         }
 
@@ -450,7 +445,8 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif)
                 .enablebits     = {{0x50,0x02,0x02}, {0x50,0x01,0x01}}, \
                 .bootable       = ON_BOARD,                             \
                 .host_flags     = IDE_HFLAG_PIO_NO_BLACKLIST            \
-                                | IDE_HFLAG_PIO_NO_DOWNGRADE,           \
+                                | IDE_HFLAG_PIO_NO_DOWNGRADE            \
+                                | IDE_HFLAG_POST_SET_MODE,              \
                 .pio_mask       = ATA_PIO5,                             \
         }