1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 64b58ecc3f0e..3c7367751873 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -104,17 +104,17 @@ static void tx4939ide_writeb(u8 val, void __iomem *base, u32 reg)
 
 #define TX4939IDE_BASE(hwif)    ((void __iomem *)(hwif)->extra_base)
 
-static void tx4939ide_set_pio_mode(ide_drive_t *drive, const u8 pio)
+static void tx4939ide_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = drive->hwif;
         int is_slave = drive->dn;
         u32 mask, val;
+        const u8 pio = drive->pio_mode - XFER_PIO_0;
         u8 safe = pio;
         ide_drive_t *pair;
 
         pair = ide_get_pair_dev(drive);
         if (pair)
-                safe = min(safe, ide_get_best_pio_mode(pair, 255, 4));
+                safe = min(safe, pair->pio_mode - XFER_PIO_0);
         /*
          * Update Command Transfer Mode for master/slave and Data
          * Transfer Mode for this drive.
@@ -125,10 +125,10 @@ static void tx4939ide_set_pio_mode(ide_drive_t *drive, const u8 pio)
         /* tx4939ide_tf_load_fixup() will set the Sys_Ctl register */
 }
 
-static void tx4939ide_set_dma_mode(ide_drive_t *drive, const u8 mode)
+static void tx4939ide_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
 {
-        ide_hwif_t *hwif = drive->hwif;
         u32 mask, val;
+        const u8 mode = drive->dma_mode;
 
         /* Update Data Transfer Mode for this drive. */
         if (mode >= XFER_UDMA_0)