1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/ide/pci/triflex.c b/drivers/ide/pci/triflex.c
index c3ff066eea5a..54e411d4e56c 100644
--- a/drivers/ide/pci/triflex.c
+++ b/drivers/ide/pci/triflex.c
@@ -40,7 +40,7 @@
 #include <linux/ide.h>
 #include <linux/init.h>
 
-static int triflex_tune_chipset(ide_drive_t *drive, const u8 speed)
+static void triflex_set_mode(ide_drive_t *drive, const u8 speed)
 {
         ide_hwif_t *hwif = HWIF(drive);
         struct pci_dev *dev = hwif->pci_dev;
@@ -82,20 +82,18 @@ static int triflex_tune_chipset(ide_drive_t *drive, const u8 speed)
                         timing = 0x0808;
                         break;
                 default:
-                        return -1;
+                        return;
         }
 
         triflex_timings &= ~(0xFFFF << (16 * unit));
         triflex_timings |= (timing << (16 * unit));
         
         pci_write_config_dword(dev, channel_offset, triflex_timings);
-        
-        return (ide_config_drive_speed(drive, speed));
 }
 
 static void triflex_set_pio_mode(ide_drive_t *drive, const u8 pio)
 {
-        (void)triflex_tune_chipset(drive, XFER_PIO_0 + pio);
+        triflex_set_mode(drive, XFER_PIO_0 + pio);
 }
 
 static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
@@ -111,7 +109,7 @@ static int triflex_config_drive_xfer_rate(ide_drive_t *drive)
 static void __devinit init_hwif_triflex(ide_hwif_t *hwif)
 {
         hwif->set_pio_mode = &triflex_set_pio_mode;
-        hwif->speedproc = &triflex_tune_chipset;
+        hwif->set_dma_mode = &triflex_set_mode;
 
         if (hwif->dma_base == 0)
                 return;