ide: call ide_build_sglist() prior to ->dma_setup (v2)

* Re-map sg table if needed in ide_build_sglist().

* Move ide_build_sglist() call from ->dma_setup to its users.

* Un-export ide_build_sglist().

v2:
* Build fix for CONFIG_BLK_DEV_IDEDMA=n (noticed by Randy Dunlap).

There should be no functional changes caused by this patch.

Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c
index a878f4734f81..12c11b71402e 100644
--- a/drivers/ide/ide-dma.c
+++ b/drivers/ide/ide-dma.c
@@ -138,14 +138,15 @@ int ide_build_sglist(ide_drive_t *drive, struct request *rq)
                 hwif->sg_dma_direction = DMA_TO_DEVICE;
 
         i = dma_map_sg(hwif->dev, sg, hwif->sg_nents, hwif->sg_dma_direction);
-        if (i) {
+        if (i == 0)
+                ide_map_sg(drive, rq);
+        else {
                 hwif->orig_sg_nents = hwif->sg_nents;
                 hwif->sg_nents = i;
         }
 
         return i;
 }
-EXPORT_SYMBOL_GPL(ide_build_sglist);
 
 /**
  *      ide_destroy_dmatable    -       clean up DMA mapping