Commit 20342f1d authored by Akinobu Mita's avatar Akinobu Mita Committed by Linus Torvalds

avr32: 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 avr32 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: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Haavard Skinnemoen <hskinnemoen@gmail.com>
Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0989e1f9
...@@ -209,17 +209,18 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, ...@@ -209,17 +209,18 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size,
* the same here. * the same here.
*/ */
static inline int static inline int
dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
enum dma_data_direction direction) enum dma_data_direction direction)
{ {
int i; int i;
struct scatterlist *sg;
for (i = 0; i < nents; i++) { for_each_sg(sglist, sg, nents, i) {
char *virt; char *virt;
sg[i].dma_address = page_to_bus(sg_page(&sg[i])) + sg[i].offset; sg->dma_address = page_to_bus(sg_page(sg)) + sg->offset;
virt = sg_virt(&sg[i]); virt = sg_virt(sg);
dma_cache_sync(dev, virt, sg[i].length, direction); dma_cache_sync(dev, virt, sg->length, direction);
} }
return nents; return nents;
...@@ -321,14 +322,14 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, ...@@ -321,14 +322,14 @@ dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg,
} }
static inline void static inline void
dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist,
int nents, enum dma_data_direction direction) int nents, enum dma_data_direction direction)
{ {
int i; int i;
struct scatterlist *sg;
for (i = 0; i < nents; i++) { for_each_sg(sglist, sg, nents, i)
dma_cache_sync(dev, sg_virt(&sg[i]), sg[i].length, direction); dma_cache_sync(dev, sg_virt(sg), sg->length, direction);
}
} }
/* Now for the API extensions over the pci_ one */ /* Now for the API extensions over the pci_ one */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment