From 0f617fe4d8674bfe37e8f18726a7042c5055a0b3 Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Tue, 22 May 2012 18:23:40 +0800 Subject: [PATCH] --- yaml --- r: 313803 b: refs/heads/master c: 86d688a3c370093f978c7ced9b510944301fc9d4 h: refs/heads/master i: 313801: be23e682462f2516960c6420bb58b3a8dc8b3133 313799: aaa7fc5310967e0de46b85b0ee5237d4ab0ae1d0 v: v3 --- [refs] | 2 +- trunk/arch/blackfin/kernel/dma-mapping.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6a2249e3b19a..078cf780644c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c8d11a06bf8242d5d6ff86fa2514c4f50cb847fb +refs/heads/master: 86d688a3c370093f978c7ced9b510944301fc9d4 diff --git a/trunk/arch/blackfin/kernel/dma-mapping.c b/trunk/arch/blackfin/kernel/dma-mapping.c index f0d1118f1825..e7be6532d6a0 100644 --- a/trunk/arch/blackfin/kernel/dma-mapping.c +++ b/trunk/arch/blackfin/kernel/dma-mapping.c @@ -122,12 +122,13 @@ void __dma_sync(dma_addr_t addr, size_t size, EXPORT_SYMBOL(__dma_sync); int -dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, +dma_map_sg(struct device *dev, struct scatterlist *sg_list, int nents, enum dma_data_direction direction) { + struct scatterlist *sg; int i; - for (i = 0; i < nents; i++, sg++) { + for_each_sg(sg_list, sg, nents, i) { sg->dma_address = (dma_addr_t) sg_virt(sg); __dma_sync(sg_dma_address(sg), sg_dma_len(sg), direction); } @@ -136,12 +137,13 @@ dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, } EXPORT_SYMBOL(dma_map_sg); -void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, +void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg_list, int nelems, enum dma_data_direction direction) { + struct scatterlist *sg; int i; - for (i = 0; i < nelems; i++, sg++) { + for_each_sg(sg_list, sg, nelems, i) { sg->dma_address = (dma_addr_t) sg_virt(sg); __dma_sync(sg_dma_address(sg), sg_dma_len(sg), direction); }