2 files changed, 16 insertions, 27 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index c7854ea57b52..0a59d5ef1599 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -181,12 +181,6 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
 {
         int mem_sttime;
         int mem_stcfg;
-        unsigned long mode;
-
-#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        if (ide_use_dma(drive))
-                mode = ide_dma_speed(drive, 0);
-#endif
 
         mem_sttime = 0;
         mem_stcfg  = au_readl(MEM_STCFG2);
@@ -195,7 +189,7 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
                 auide_tune_drive(drive, speed - XFER_PIO_0);
                 return 0;
         }
-              
+
         switch(speed) {
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
         case XFER_MW_DMA_2:
@@ -207,7 +201,6 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
                 mem_stcfg &= ~TOECS_MASK;
                 mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS;
 
-                mode = XFER_MW_DMA_2;
                 break;
         case XFER_MW_DMA_1:
                 mem_sttime = SBC_IDE_TIMING(MDMA1);
@@ -218,7 +211,6 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
                 mem_stcfg &= ~TOECS_MASK;
                 mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS;
 
-                mode = XFER_MW_DMA_1;
                 break;
         case XFER_MW_DMA_0:
                 mem_sttime = SBC_IDE_TIMING(MDMA0);
@@ -229,14 +221,13 @@ static int auide_tune_chipset (ide_drive_t *drive, u8 speed)
                 mem_stcfg &= ~TOECS_MASK;
                 mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS;
 
-                mode = XFER_MW_DMA_0;
                 break;
 #endif
         default:
                 return 1;
         }
-        
-        if (ide_config_drive_speed(drive, mode))
+
+        if (ide_config_drive_speed(drive, speed))
                 return 1;
 
         au_writel(mem_sttime,MEM_STTIME2);
@@ -423,9 +414,9 @@ static int auide_dma_check(ide_drive_t *drive)
         speed = ide_find_best_mode(drive, XFER_PIO | XFER_MWDMA);
         
         if (drive->autodma && (speed & XFER_MODE) != XFER_PIO)
-                return HWIF(drive)->ide_dma_on(drive);
+                return 0;
 
-        return HWIF(drive)->ide_dma_off_quietly(drive);
+        return -1;
 }
 
 static int auide_dma_test_irq(ide_drive_t *drive)
@@ -447,27 +438,24 @@ static int auide_dma_test_irq(ide_drive_t *drive)
         return 0;
 }
 
-static int auide_dma_host_on(ide_drive_t *drive)
+static void auide_dma_host_on(ide_drive_t *drive)
 {
-        return 0;
 }
 
 static int auide_dma_on(ide_drive_t *drive)
 {
         drive->using_dma = 1;
-        return auide_dma_host_on(drive);
-}
 
+        return 0;
+}
 
-static int auide_dma_host_off(ide_drive_t *drive)
+static void auide_dma_host_off(ide_drive_t *drive)
 {
-        return 0;
 }
 
-static int auide_dma_off_quietly(ide_drive_t *drive)
+static void auide_dma_off_quietly(ide_drive_t *drive)
 {
         drive->using_dma = 0;
-        return auide_dma_host_off(drive);
 }
 
 static int auide_dma_lostirq(ide_drive_t *drive)
@@ -717,7 +705,8 @@ static int au_ide_probe(struct device *dev)
 
         /* hold should be on in all cases */
         hwif->hold                      = 1;
-        hwif->mmio                      = 2;
+
+        hwif->mmio  = 1;
 
         /* If the user has selected DDMA assisted copies,
            then set up a few local I/O function entry points 
@@ -732,7 +721,7 @@ static int au_ide_probe(struct device *dev)
         hwif->speedproc                 = &auide_tune_chipset;
 
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
-        hwif->ide_dma_off_quietly       = &auide_dma_off_quietly;
+        hwif->dma_off_quietly           = &auide_dma_off_quietly;
         hwif->ide_dma_timeout           = &auide_dma_timeout;
 
         hwif->ide_dma_check             = &auide_dma_check;
@@ -741,8 +730,8 @@ static int au_ide_probe(struct device *dev)
         hwif->ide_dma_end               = &auide_dma_end;
         hwif->dma_setup                 = &auide_dma_setup;
         hwif->ide_dma_test_irq          = &auide_dma_test_irq;
-        hwif->ide_dma_host_off          = &auide_dma_host_off;
-        hwif->ide_dma_host_on           = &auide_dma_host_on;
+        hwif->dma_host_off              = &auide_dma_host_off;
+        hwif->dma_host_on               = &auide_dma_host_on;
         hwif->ide_dma_lostirq           = &auide_dma_lostirq;
         hwif->ide_dma_on                = &auide_dma_on;
 
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index 09c9e7936b0d..81fa06851b27 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -115,7 +115,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
         /* Setup MMIO ops.  */
         default_hwif_mmiops(hwif);
         /* Prevent resource map manipulation.  */
-        hwif->mmio = 2;
+        hwif->mmio = 1;
         hwif->noprobe = 0;
 
         for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++)