1 files changed, 9 insertions, 41 deletions

diff --git a/drivers/ide/pci/cs5530.c b/drivers/ide/pci/cs5530.c
index 741507b4cd93..e4121577cef0 100644
--- a/drivers/ide/pci/cs5530.c
+++ b/drivers/ide/pci/cs5530.c
@@ -30,22 +30,6 @@
 #include <asm/io.h>
 #include <asm/irq.h>
 
-/**
- *      cs5530_xfer_set_mode    -       set a new transfer mode at the drive
- *      @drive: drive to tune
- *      @mode: new mode
- *
- *      Logging wrapper to the IDE driver speed configuration. This can
- *      probably go away now.
- */
- 
-static int cs5530_set_xfer_mode (ide_drive_t *drive, u8 mode)
-{
-        printk(KERN_DEBUG "%s: cs5530_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.
@@ -62,20 +46,12 @@ static unsigned int cs5530_pio_timings[2][5] = {
 #define CS5530_BAD_PIO(timings) (((timings)&~0x80000000)==0x0000e132)
 #define CS5530_BASEREG(hwif)    (((hwif)->dma_base & ~0xf) + ((hwif)->channel ? 0x30 : 0x20))
 
-static void cs5530_tunepio(ide_drive_t *drive, u8 pio)
-{
-        unsigned long basereg = CS5530_BASEREG(drive->hwif);
-        unsigned int format = (inl(basereg + 4) >> 31) & 1;
-
-        outl(cs5530_pio_timings[format][pio], basereg + ((drive->dn & 1)<<3));
-}
-
 /**
- *      cs5530_set_pio_mode     -       set PIO mode
+ *      cs5530_set_pio_mode     -       set host controller for PIO mode
  *      @drive: drive
  *      @pio: PIO mode number
  *
- *      Handles setting of PIO mode for both the chipset and drive.
+ *      Handles setting of PIO mode for the chipset.
  *
  *      The init_hwif_cs5530() routine guarantees that all drives
  *      will have valid default PIO timings set up before we get here.
@@ -83,8 +59,10 @@ static void cs5530_tunepio(ide_drive_t *drive, u8 pio)
 
 static void cs5530_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        if (cs5530_set_xfer_mode(drive, XFER_PIO_0 + pio) == 0)
-                cs5530_tunepio(drive, pio);
+        unsigned long basereg = CS5530_BASEREG(drive->hwif);
+        unsigned int format = (inl(basereg + 4) >> 31) & 1;
+
+        outl(cs5530_pio_timings[format][pio], basereg + ((drive->dn & 1)<<3));
 }
 
 /**
@@ -142,20 +120,11 @@ static int cs5530_config_dma(ide_drive_t *drive)
         return 1;
 }
 
-static int cs5530_tune_chipset(ide_drive_t *drive, const u8 mode)
+static void cs5530_set_dma_mode(ide_drive_t *drive, const u8 mode)
 {
         unsigned long basereg;
         unsigned int reg, timings = 0;
 
-        /*
-         * Tell the drive to switch to the new mode; abort on failure.
-         */
-        if (cs5530_set_xfer_mode(drive, mode))
-                return 1;       /* failure */
-
-        /*
-         * Now tune the chipset to match the drive:
-         */
         switch (mode) {
                 case XFER_UDMA_0:       timings = 0x00921250; break;
                 case XFER_UDMA_1:       timings = 0x00911140; break;
@@ -180,8 +149,6 @@ static int cs5530_tune_chipset(ide_drive_t *drive, const u8 mode)
                 outl(reg, basereg + 4);         /* write drive0 config register */
                 outl(timings, basereg + 12);    /* write drive1 config register */
         }
-
-        return 0;       /* success */
 }
 
 /**
@@ -299,7 +266,7 @@ static void __devinit init_hwif_cs5530 (ide_hwif_t *hwif)
                 hwif->serialized = hwif->mate->serialized = 1;
 
         hwif->set_pio_mode = &cs5530_set_pio_mode;
-        hwif->speedproc = &cs5530_tune_chipset;
+        hwif->set_dma_mode = &cs5530_set_dma_mode;
 
         basereg = CS5530_BASEREG(hwif);
         d0_timings = inl(basereg + 0);
@@ -340,6 +307,7 @@ static ide_pci_device_t cs5530_chipset __devinitdata = {
         .autodma        = AUTODMA,
         .bootable       = ON_BOARD,
         .pio_mask       = ATA_PIO4,
+        .host_flags     = IDE_HFLAG_POST_SET_MODE,
 };
 
 static int __devinit cs5530_init_one(struct pci_dev *dev, const struct pci_device_id *id)