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, 1 insertions, 6 deletions

diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 82f153810eb9..3fc3ced8192c 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -211,21 +211,16 @@ static void auide_set_dma_mode(ide_drive_t *drive, const u8 speed)
 #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 static int auide_build_dmatable(ide_drive_t *drive)
 {
-        int i, iswrite, count = 0;
         ide_hwif_t *hwif = drive->hwif;
         struct request *rq = hwif->rq;
         _auide_hwif *ahwif = &auide_hwif;
         struct scatterlist *sg;
+        int i = hwif->sg_nents, iswrite, count = 0;
 
         iswrite = (rq_data_dir(rq) == WRITE);
         /* Save for interrupt context */
         ahwif->drive = drive;
 
-        hwif->sg_nents = i = ide_build_sglist(drive, rq);
-
-        if (!i)
-                return 0;
-
         /* fill the descriptors */
         sg = hwif->sg_table;
         while (i && sg_dma_len(sg)) {