ide: cleanup ide_set_dma()

* ->dma_off_quietly is always called before ide_set_dma()
  so the call can be moved inside ide_set_dma().

* ide_dma_check() doesn't touch hardware so ->dma_off_quietly
  call for 'rc == -1' case is redundant, remove it.

* '0' and '-1' are the only values returned by ide_dma_check()
  so remove dead code for other cases.

There should be no functionality changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 33e62d28465d..0379d1f697cf 100644
--- a/drivers/ide/ide-probe.c
+++ b/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);
-                        }
                 }
         }