1 files changed, 5 insertions, 27 deletions

diff --git a/drivers/ide/pci/sc1200.c b/drivers/ide/pci/sc1200.c
index 79ecab689489..76f0868054a1 100644
--- a/drivers/ide/pci/sc1200.c
+++ b/drivers/ide/pci/sc1200.c
@@ -68,17 +68,6 @@ static unsigned short sc1200_get_pci_clock (void)
         return pci_clock;
 }
 
-extern char *ide_xfer_verbose (byte xfer_rate);
-
-/*
- * Set a new transfer mode at the drive
- */
-static int sc1200_set_xfer_mode (ide_drive_t *drive, byte mode)
-{
-        printk("%s: sc1200_set_xfer_mode(%s)\n", drive->name, ide_xfer_verbose(mode));
-        return ide_config_drive_speed(drive, mode);
-}
-
 /*
  * Here are the standard PIO mode 0-4 timings for each "format".
  * Format-0 uses fast data reg timings, with slower command reg timings.
@@ -138,7 +127,7 @@ out:
         return mask;
 }
 
-static int sc1200_tune_chipset(ide_drive_t *drive, const u8 mode)
+static void sc1200_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
         ide_hwif_t              *hwif = HWIF(drive);
         int                     unit = drive->select.b.unit;
@@ -146,17 +135,9 @@ static int sc1200_tune_chipset(ide_drive_t *drive, const u8 mode)
         unsigned short          pci_clock;
         unsigned int            basereg = hwif->channel ? 0x50 : 0x40;
 
-        /*
-         * Tell the drive to switch to the new mode; abort on failure.
-         */
-        if (sc1200_set_xfer_mode(drive, mode))
-                return 1;       /* failure */
-
         pci_clock = sc1200_get_pci_clock();
 
         /*
-         * Now tune the chipset to match the drive:
-         *
          * Note that each DMA mode has several timings associated with it.
          * The correct timing depends on the fast PCI clock freq.
          */
@@ -216,8 +197,6 @@ static int sc1200_tune_chipset(ide_drive_t *drive, const u8 mode)
         } else {
                 pci_write_config_dword(hwif->pci_dev, basereg+12, timings);
         }
-
-        return 0;       /* success */
 }
 
 /*
@@ -286,13 +265,12 @@ static void sc1200_set_pio_mode(ide_drive_t *drive, const u8 pio)
         if (mode != -1) {
                 printk("SC1200: %s: changing (U)DMA mode\n", drive->name);
                 hwif->dma_off_quietly(drive);
-                if (sc1200_tune_chipset(drive, mode) == 0)
+                if (ide_set_dma_mode(drive, mode) == 0)
                         hwif->dma_host_on(drive);
                 return;
         }
 
-        if (sc1200_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
-                sc1200_tunepio(drive, pio);
+        sc1200_tunepio(drive, pio);
 }
 
 #ifdef CONFIG_PM
@@ -408,7 +386,7 @@ static void __devinit init_hwif_sc1200 (ide_hwif_t *hwif)
                         hwif->autodma = 1;
 
                 hwif->set_pio_mode = &sc1200_set_pio_mode;
-                hwif->speedproc = &sc1200_tune_chipset;
+                hwif->set_dma_mode = &sc1200_set_dma_mode;
         }
         hwif->atapi_dma = 1;
         hwif->ultra_mask = 0x07;
@@ -423,7 +401,7 @@ static ide_pci_device_t sc1200_chipset __devinitdata = {
         .init_hwif      = init_hwif_sc1200,
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
-        .host_flags     = IDE_HFLAG_ABUSE_DMA_MODES,
+        .host_flags     = IDE_HFLAG_ABUSE_DMA_MODES | IDE_HFLAG_POST_SET_MODE,
         .pio_mask       = ATA_PIO4,
 };