ide: use ide_build_sglist() and ide_destroy_dmatable() in non-PCI host drivers

* Make ide_build_sglist() and ide_destroy_dmatable() available also when
  CONFIG_BLK_DEV_IDEDMA_PCI=n.

* Use ide_build_sglist() and ide_destroy_dmatable() in {ics,au1xxx-}ide.c
  and remove no longer needed {ics,au}ide_build_sglist().

There should be no functionality changes caused by this patch.

Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 3 insertions, 25 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 7ec96a030041..ed1a285efe14 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -209,23 +209,6 @@ 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_sglist(ide_drive_t *drive,  struct request *rq)
-{
-        ide_hwif_t *hwif = drive->hwif;
-        struct scatterlist *sg = hwif->sg_table;
-
-        ide_map_sg(drive, rq);
-
-        if (rq_data_dir(rq) == READ)
-                hwif->sg_dma_direction = DMA_FROM_DEVICE;
-        else
-                hwif->sg_dma_direction = DMA_TO_DEVICE;
-
-        return dma_map_sg(hwif->dev, sg, hwif->sg_nents,
-                          hwif->sg_dma_direction);
-}
-
 static int auide_build_dmatable(ide_drive_t *drive)
 {
         int i, iswrite, count = 0;
@@ -240,8 +223,7 @@ static int auide_build_dmatable(ide_drive_t *drive)
         /* Save for interrupt context */
         ahwif->drive = drive;
 
-        /* Build sglist */
-        hwif->sg_nents = i = auide_build_sglist(drive, rq);
+        hwif->sg_nents = i = ide_build_sglist(drive, rq);
 
         if (!i)
                 return 0;
@@ -299,10 +281,7 @@ static int auide_build_dmatable(ide_drive_t *drive)
                 return 1;
 
  use_pio_instead:
-        dma_unmap_sg(hwif->dev,
-                     hwif->sg_table,
-                     hwif->sg_nents,
-                     hwif->sg_dma_direction);
+        ide_destroy_dmatable(drive);
 
         return 0; /* revert to PIO for this request */
 }
@@ -312,8 +291,7 @@ static int auide_dma_end(ide_drive_t *drive)
         ide_hwif_t *hwif = HWIF(drive);
 
         if (hwif->sg_nents) {
-                dma_unmap_sg(hwif->dev, hwif->sg_table, hwif->sg_nents,
-                             hwif->sg_dma_direction);
+                ide_destroy_dmatable(drive);
                 hwif->sg_nents = 0;
         }