ide: move ide_map_sg() call out of ->dma_setup method (take 2)

Move ide_map_sg() call from ->dma_setup implementations and
ide_destroy_dmatable() one from *_build_dmatable() to ide_dma_prepare().

There should be no functional changes caused by this patch.

Sergei:
Removed 'use_pio_instead' labels and replaced 'goto' with 'return 0' --
that required no changes to the follow-up patches...

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

1 files changed, 2 insertions, 7 deletions

diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index ba2a211758a9..239643806b97 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -236,7 +236,7 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
                         if (++count >= PRD_ENTRIES) {
                                 printk(KERN_WARNING "%s: DMA table too small\n",
                                        drive->name);
-                                goto use_pio_instead;
+                                return 0;
                         }
 
                         /* Lets enable intr for the last descriptor only */
@@ -272,9 +272,6 @@ static int auide_build_dmatable(ide_drive_t *drive, struct ide_cmd *cmd)
         if (count)
                 return 1;
 
- use_pio_instead:
-        ide_destroy_dmatable(drive);
-
         return 0; /* revert to PIO for this request */
 }
 
@@ -290,10 +287,8 @@ static void auide_dma_start(ide_drive_t *drive )
 
 static int auide_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
 {
-        if (auide_build_dmatable(drive, cmd) == 0) {
-                ide_map_sg(drive, cmd);
+        if (auide_build_dmatable(drive, cmd) == 0)
                 return 1;
-        }
 
         drive->waiting_for_dma = 1;
         return 0;