parisc: Eliminate sg_virt_addr() and private scatterlist.h

[karo-tx-linux.git] / arch / parisc / kernel / pci-dma.c

diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c
index d87d1c476d851c233b02580beaffbb25cc22eb1a..ff834fd67478acce421a2b6c6be35585de35aacb 100644 (file)
--- 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 = {