parisc: Eliminate sg_virt_addr() and private scatterlist.h

The only reason to keep parisc's private asm/scatterlist.h was that it
had the macro sg_virt_addr().  Convert all callers to use something else
(sometimes just sg->offset was enough, others should use sg_virt()), and
we can just use the asm-generic scatterlist.h instead.

Signed-off-by: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: Dave Anglin <dave.anglin@bell.net>
Signed-off-by: Helge Deller <deller@gmx.de>

3 files changed, 5 insertions, 14 deletions

diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild
index 12b341d04f88..7a4bcc36303d 100644
--- a/arch/parisc/include/asm/Kbuild
+++ b/arch/parisc/include/asm/Kbuild
@@ -20,6 +20,7 @@ generic-y += param.h
 generic-y += percpu.h
 generic-y += poll.h
 generic-y += preempt.h
+generic-y += scatterlist.h
 generic-y += seccomp.h
 generic-y += segment.h
 generic-y += topology.h
diff --git a/arch/parisc/include/asm/scatterlist.h b/arch/parisc/include/asm/scatterlist.h
deleted file mode 100644
index 8bf1f0dd1f15..000000000000
--- a/arch/parisc/include/asm/scatterlist.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _ASM_PARISC_SCATTERLIST_H
-#define _ASM_PARISC_SCATTERLIST_H
-
-#include <asm/page.h>
-#include <asm/types.h>
-#include <asm-generic/scatterlist.h>
-
-#define sg_virt_addr(sg) ((unsigned long)sg_virt(sg))
-
-#endif /* _ASM_PARISC_SCATTERLIST_H */
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index d87d1c476d85..ff834fd67478 100644
--- a/arch/parisc/kernel/pci-dma.c
+++ b/arch/parisc/kernel/pci-dma.c
@@ -482,7 +482,7 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int n
         BUG_ON(direction == DMA_NONE);
 
         for (i = 0; i < nents; i++, sglist++ ) {
-                unsigned long vaddr = sg_virt_addr(sglist);
+                unsigned long vaddr = (unsigned long)sg_virt(sglist);
                 sg_dma_address(sglist) = (dma_addr_t) virt_to_phys(vaddr);
                 sg_dma_len(sglist) = sglist->length;
                 flush_kernel_dcache_range(vaddr, sglist->length);
@@ -502,7 +502,7 @@ static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, in
         /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
         for (i = 0; i < nents; i++, sglist++ )
-                flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);
+                flush_kernel_vmap_range(sg_virt(sglist), sglist->length);
         return;
 }
 
@@ -527,7 +527,7 @@ static void pa11_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sgl
         /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
         for (i = 0; i < nents; i++, sglist++ )
-                flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);
+                flush_kernel_vmap_range(sg_virt(sglist), sglist->length);
 }
 
 static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
@@ -537,7 +537,7 @@ static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *
         /* once we do combining we'll need to use phys_to_virt(sg_dma_address(sglist)) */
 
         for (i = 0; i < nents; i++, sglist++ )
-                flush_kernel_dcache_range(sg_virt_addr(sglist), sglist->length);
+                flush_kernel_vmap_range(sg_virt(sglist), sglist->length);
 }
 
 struct hppa_dma_ops pcxl_dma_ops = {