sparc/io-unit: fix ->map_sg return value

Just decrementing the sz value will lead to an incorrect return value.
Instead of just introducing a local variable switch to the standard
for_each_sg helper and standard naming of the arguments.

Fixes: ce65d36f3e ("sparc: remove the sparc32_dma_ops indirection")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Sam Ravnborg <sam@ravnborg.org>

diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c
index 2088d292c6e56869541d043a1b6f3becd04424b1..91be13935d40888bc7628731dd15cdf5ccfb29a0 100644 (file)
--- a/arch/sparc/mm/io-unit.c
+++ b/arch/sparc/mm/io-unit.c
@@ -158,22 +158,22 @@ static dma_addr_t iounit_map_page(struct device *dev, struct page *page,
        return ret;
 }
 
-static int iounit_map_sg(struct device *dev, struct scatterlist *sg, int sz,
+static int iounit_map_sg(struct device *dev, struct scatterlist *sgl, int nents,
                enum dma_data_direction dir, unsigned long attrs)
 {
        struct iounit_struct *iounit = dev->archdata.iommu;
+       struct scatterlist *sg;
        unsigned long flags;
+       int i;
 
        /* FIXME: Cache some resolved pages - often several sg entries are to the same page */
        spin_lock_irqsave(&iounit->lock, flags);
-       while (sz != 0) {
-               --sz;
+       for_each_sg(sgl, sg, nents, i) {
                sg->dma_address = iounit_get_area(iounit, (unsigned long) sg_virt(sg), sg->length);
                sg->dma_length = sg->length;
-               sg = sg_next(sg);
        }
        spin_unlock_irqrestore(&iounit->lock, flags);
-       return sz;
+       return nents;
 }
 
 static void iounit_unmap_page(struct device *dev, dma_addr_t vaddr, size_t len,
@@ -191,22 +191,21 @@ static void iounit_unmap_page(struct device *dev, dma_addr_t vaddr, size_t len,
        spin_unlock_irqrestore(&iounit->lock, flags);
 }
 
-static void iounit_unmap_sg(struct device *dev, struct scatterlist *sg, int sz,
-               enum dma_data_direction dir, unsigned long attrs)
+static void iounit_unmap_sg(struct device *dev, struct scatterlist *sgl,
+               int nents, enum dma_data_direction dir, unsigned long attrs)
 {
        struct iounit_struct *iounit = dev->archdata.iommu;
-       unsigned long flags;
-       unsigned long vaddr, len;
+       unsigned long flags, vaddr, len;
+       struct scatterlist *sg;
+       int i;
 
        spin_lock_irqsave(&iounit->lock, flags);
-       while (sz != 0) {
-               --sz;
+       for_each_sg(sgl, sg, nents, i) {
                len = ((sg->dma_address & ~PAGE_MASK) + sg->length + (PAGE_SIZE-1)) >> PAGE_SHIFT;
                vaddr = (sg->dma_address - IOUNIT_DMA_BASE) >> PAGE_SHIFT;
                IOD(("iounit_release %08lx-%08lx\n", (long)vaddr, (long)len+vaddr));
                for (len += vaddr; vaddr < len; vaddr++)
                        clear_bit(vaddr, iounit->bmap);
-               sg = sg_next(sg);
        }
        spin_unlock_irqrestore(&iounit->lock, flags);
 }