Messages in this thread Patch in this message | | | From | tom.leiming@gmail ... | Subject | [PATCH v2 4/4] ARM:dma-mapping:fix dma_map_sg and dma_unmap_sg | Date | Mon, 20 Jul 2009 22:25:54 +0800 |
| |
From: Ming Lei <tom.leiming@gmail.com>
This patch removes unnecessary calling of debug_dma_map_page and debug_dma_unmap_page in dma_map_sg and dma_unmap_sg.
Signed-off-by: Ming Lei <tom.leiming@gmail.com> --- arch/arm/mm/dma-mapping.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 64e5d82..584018c 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -610,7 +610,7 @@ int __dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, int i, j; for_each_sg(sg, s, nents, i) { - s->dma_address = dma_map_page(dev, sg_page(s), s->offset, + s->dma_address = __dma_map_page(dev, sg_page(s), s->offset, s->length, dir); if (dma_mapping_error(dev, s->dma_address)) goto bad_mapping; @@ -619,7 +619,7 @@ int __dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, bad_mapping: for_each_sg(sg, s, i, j) - dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir); + __dma_unmap_single(dev, sg_dma_address(s), sg_dma_len(s), dir); return 0; } EXPORT_SYMBOL(__dma_map_sg); @@ -641,7 +641,7 @@ void __dma_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int i; for_each_sg(sg, s, nents, i) - dma_unmap_page(dev, sg_dma_address(s), sg_dma_len(s), dir); + __dma_unmap_single(dev, sg_dma_address(s), sg_dma_len(s), dir); } EXPORT_SYMBOL(__dma_unmap_sg); -- 1.6.0.GIT
| |