These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / parisc / kernel / pci-dma.c

diff --git a/kernel/arch/parisc/kernel/pci-dma.c b/kernel/arch/parisc/kernel/pci-dma.c
index ff834fd..b9402c9 100644 (file)
--- a/kernel/arch/parisc/kernel/pci-dma.c
+++ b/kernel/arch/parisc/kernel/pci-dma.c
@@ -478,14 +478,16 @@ static void pa11_dma_unmap_single(struct device *dev, dma_addr_t dma_handle, siz
 static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
 {
        int i;
+       struct scatterlist *sg;
 
        BUG_ON(direction == DMA_NONE);
 
-       for (i = 0; i < nents; i++, 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);
+       for_each_sg(sglist, sg, nents, i) {
+               unsigned long vaddr = (unsigned long)sg_virt(sg);
+
+               sg_dma_address(sg) = (dma_addr_t) virt_to_phys(vaddr);
+               sg_dma_len(sg) = sg->length;
+               flush_kernel_dcache_range(vaddr, sg->length);
        }
        return nents;
 }
@@ -493,6 +495,7 @@ static int pa11_dma_map_sg(struct device *dev, struct scatterlist *sglist, int n
 static void pa11_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
 {
        int i;
+       struct scatterlist *sg;
 
        BUG_ON(direction == DMA_NONE);
 
@@ -501,8 +504,8 @@ 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_vmap_range(sg_virt(sglist), sglist->length);
+       for_each_sg(sglist, sg, nents, i)
+               flush_kernel_vmap_range(sg_virt(sg), sg->length);
        return;
 }
 
@@ -523,21 +526,23 @@ static void pa11_dma_sync_single_for_device(struct device *dev, dma_addr_t dma_h
 static void pa11_dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
 {
        int i;
+       struct scatterlist *sg;
 
        /* 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_vmap_range(sg_virt(sglist), sglist->length);
+       for_each_sg(sglist, sg, nents, i)
+               flush_kernel_vmap_range(sg_virt(sg), sg->length);
 }
 
 static void pa11_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist, int nents, enum dma_data_direction direction)
 {
        int i;
+       struct scatterlist *sg;
 
        /* 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_vmap_range(sg_virt(sglist), sglist->length);
+       for_each_sg(sglist, sg, nents, i)
+               flush_kernel_vmap_range(sg_virt(sg), sg->length);
 }
 
 struct hppa_dma_ops pcxl_dma_ops = {