Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ide/ide-dma.c   |   25 +++++++++++--------------
 drivers/ide/ide-io.c    |    1 -
 drivers/ide/ide-probe.c |   10 +---------
 drivers/ide/ide.c       |    1 -
 4 files changed, 12 insertions(+), 25 deletions(-)

diff -puN drivers/ide/ide-dma.c~ide-mm-ide-cleanup-ide_set_dma drivers/ide/ide-dma.c
--- a/drivers/ide/ide-dma.c~ide-mm-ide-cleanup-ide_set_dma
+++ a/drivers/ide/ide-dma.c
@@ -827,22 +827,19 @@ int ide_set_dma(ide_drive_t *drive)
 	ide_hwif_t *hwif = drive->hwif;
 	int rc;
 
-	rc = ide_dma_check(drive);
+	/*
+	 * Force DMAing for the beginning of the check.
+	 * Some chipsets appear to do interesting
+	 * things, if not checked and cleared.
+	 *   PARANOIA!!!
+	 */
+	hwif->dma_off_quietly(drive);
 
-	switch(rc) {
-	case -1: /* DMA needs to be disabled */
-		hwif->dma_off_quietly(drive);
-		return -1;
-	case  0: /* DMA needs to be enabled */
-		return hwif->ide_dma_on(drive);
-	case  1: /* DMA setting cannot be changed */
-		break;
-	default:
-		BUG();
-		break;
-	}
+	rc = ide_dma_check(drive);
+	if (rc)
+		return rc;
 
-	return rc;
+	return hwif->ide_dma_on(drive);
 }
 
 #ifdef CONFIG_BLK_DEV_IDEDMA_PCI
diff -puN drivers/ide/ide-io.c~ide-mm-ide-cleanup-ide_set_dma drivers/ide/ide-io.c
--- a/drivers/ide/ide-io.c~ide-mm-ide-cleanup-ide_set_dma
+++ a/drivers/ide/ide-io.c
@@ -221,7 +221,6 @@ static ide_startstop_t ide_start_power_s
 		 */
 		if (drive->hwif->ide_dma_on == NULL)
 			break;
-		drive->hwif->dma_off_quietly(drive);
 		/*
 		 * TODO: respect ->using_dma setting
 		 */
diff -puN drivers/ide/ide-probe.c~ide-mm-ide-cleanup-ide_set_dma drivers/ide/ide-probe.c
--- a/drivers/ide/ide-probe.c~ide-mm-ide-cleanup-ide_set_dma
+++ a/drivers/ide/ide-probe.c
@@ -833,16 +833,8 @@ static void probe_hwif(ide_hwif_t *hwif)
 
 			drive->nice1 = 1;
 
-			if (hwif->ide_dma_on) {
-				/*
-				 * Force DMAing for the beginning of the check.
-				 * Some chipsets appear to do interesting
-				 * things, if not checked and cleared.
-				 *   PARANOIA!!!
-				 */
-				hwif->dma_off_quietly(drive);
+			if (hwif->ide_dma_on)
 				ide_set_dma(drive);
-			}
 		}
 	}
 
diff -puN drivers/ide/ide.c~ide-mm-ide-cleanup-ide_set_dma drivers/ide/ide.c
--- a/drivers/ide/ide.c~ide-mm-ide-cleanup-ide_set_dma
+++ a/drivers/ide/ide.c
@@ -851,7 +851,6 @@ int set_using_dma(ide_drive_t *drive, in
 	err = 0;
 
 	if (arg) {
-		hwif->dma_off_quietly(drive);
 		if (ide_set_dma(drive))
 			err = -EIO;
 	} else
_