frv: use for_each_sg()

This replaces the plain loop over the sglist array with for_each_sg()
macro which consists of sg_next() function calls.  Since frv doesn't
select ARCH_HAS_SG_CHAIN, it is not necessary to use for_each_sg() in
order to loop over each sg element.  But this can help find problems
with drivers that do not properly initialize their sg tables when
CONFIG_DEBUG_SG is enabled.

Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Cc: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/frv/mb93090-mb00/pci-dma-nommu.c b/arch/frv/mb93090-mb00/pci-dma-nommu.c
index b99c2a7cc7a41f6a0398c4a34715749d2a935afc..8eeea0d77aadace16347a550974a4c58983b53fb 100644 (file)
--- a/arch/frv/mb93090-mb00/pci-dma-nommu.c
+++ b/arch/frv/mb93090-mb00/pci-dma-nommu.c
@@ -119,14 +119,16 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
 
 EXPORT_SYMBOL(dma_map_single);
 
-int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
+int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
               enum dma_data_direction direction)
 {
        int i;
+       struct scatterlist *sg;
 
-       for (i=0; i<nents; i++)
-               frv_cache_wback_inv(sg_dma_address(&sg[i]),
-                                   sg_dma_address(&sg[i]) + sg_dma_len(&sg[i]));
+       for_each_sg(sglist, sg, nents, i) {
+               frv_cache_wback_inv(sg_dma_address(sg),
+                                   sg_dma_address(sg) + sg_dma_len(sg));
+       }
 
        BUG_ON(direction == DMA_NONE);
 

diff --git a/arch/frv/mb93090-mb00/pci-dma.c b/arch/frv/mb93090-mb00/pci-dma.c
index 82478979ac9a8c46c38e3b7746d284f3fe593da6..4d1f01dc46e5bb8e5aa1b2e53aa495d4d50ee391 100644 (file)
--- a/arch/frv/mb93090-mb00/pci-dma.c
+++ b/arch/frv/mb93090-mb00/pci-dma.c
@@ -50,19 +50,20 @@ dma_addr_t dma_map_single(struct device *dev, void *ptr, size_t size,
 
 EXPORT_SYMBOL(dma_map_single);
 
-int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents,
+int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
               enum dma_data_direction direction)
 {
        unsigned long dampr2;
        void *vaddr;
        int i;
+       struct scatterlist *sg;
 
        BUG_ON(direction == DMA_NONE);
 
        dampr2 = __get_DAMPR(2);
 
-       for (i = 0; i < nents; i++) {
-               vaddr = kmap_atomic_primary(sg_page(&sg[i]));
+       for_each_sg(sglist, sg, nents, i) {
+               vaddr = kmap_atomic_primary(sg_page(sg));
 
                frv_dcache_writeback((unsigned long) vaddr,
                                     (unsigned long) vaddr + PAGE_SIZE);