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, 3 deletions

diff --git a/drivers/ide/trm290.c b/drivers/ide/trm290.c
index 1076efd050dc..0be27cae27d5 100644
--- a/drivers/ide/trm290.c
+++ b/drivers/ide/trm290.c
@@ -193,11 +193,10 @@ static int trm290_dma_setup(ide_drive_t *drive, struct ide_cmd *cmd)
         unsigned int count, rw = (cmd->tf_flags & IDE_TFLAG_WRITE) ? 1 : 2;
 
         count = ide_build_dmatable(drive, cmd);
-        if (count == 0) {
-                ide_map_sg(drive, cmd);
+        if (count == 0)
                 /* try PIO instead of DMA */
                 return 1;
-        }
+
         outl(hwif->dmatable_dma | rw, hwif->dma_base);
         drive->waiting_for_dma = 1;
         /* start DMA */