[ARM] Remove '__address' from scatterlist and convert to DMA API

The old __address element in struct scatterlist remained from older
kernels because the ARM DMA emulation code made use of it.  Move
this field into struct dma_struct, and convert DMA emulation code
to setup a SG entry as required.

Also, convert DMA emulation code to use the new DMA API rather
than the PCI DMA API.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 11 insertions, 8 deletions

diff --git a/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c
index bc0747439fb3..bd86ffba8810 100644
--- a/arch/arm/mach-rpc/dma.c
+++ b/arch/arm/mach-rpc/dma.c
@@ -13,7 +13,7 @@
 #include <linux/mman.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
-#include <linux/pci.h>
+#include <linux/dma-mapping.h>
 
 #include <asm/page.h>
 #include <asm/dma.h>
@@ -148,11 +148,14 @@ static void iomd_enable_dma(dmach_t channel, dma_t *dma)
                  * Cope with ISA-style drivers which expect cache
                  * coherence.
                  */
-                if (!dma->using_sg) {
-                        dma->buf.dma_address = pci_map_single(NULL,
-                                dma->buf.__address, dma->buf.length,
+                if (!dma->sg) {
+                        dma->sg = &dma->buf;
+                        dma->sgcount = 1;
+                        dma->buf.length = dma->count;
+                        dma->buf.dma_address = dma_map_single(NULL,
+                                dma->addr, dma->count,
                                 dma->dma_mode == DMA_MODE_READ ?
-                                PCI_DMA_FROMDEVICE : PCI_DMA_TODEVICE);
+                                DMA_FROM_DEVICE : DMA_TO_DEVICE);
                 }
 
                 iomd_writeb(DMA_CR_C, dma_base + CR);
@@ -239,7 +242,7 @@ static void floppy_enable_dma(dmach_t channel, dma_t *dma)
         unsigned int fiqhandler_length;
         struct pt_regs regs;
 
-        if (dma->using_sg)
+        if (dma->sg)
                 BUG();
 
         if (dma->dma_mode == DMA_MODE_READ) {
@@ -252,8 +255,8 @@ static void floppy_enable_dma(dmach_t channel, dma_t *dma)
                 fiqhandler_length = &floppy_fiqout_end - &floppy_fiqout_start;
         }
 
-        regs.ARM_r9  = dma->buf.length;
-        regs.ARM_r10 = (unsigned long)dma->buf.__address;
+        regs.ARM_r9  = dma->count;
+        regs.ARM_r10 = (unsigned long)dma->addr;
         regs.ARM_fp  = (unsigned long)FLOPPYDMA_BASE;
 
         if (claim_fiq(&fh)) {