lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dma40: use sg_dma_address() instead of sg_phys()

Browse Source 
The address to use for DMA should be taken from sg_dma_address() and not
sg_phys().

Acked-by: Per Forlin <per.forlin@stericsson.com>
Acked-by: Jonas Aaberg <jonas.aberg@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Rabin Vincent
2011-01-25 11:18:13 +01:00
committed by Dan Williams
parent 594ece4dc0
commit 7fe8be5a74
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/dma/ste_dma40_ll.c
View File

@@ -272,7 +272,7 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
if (target) if (target)
dst = target; dst = target;
else else
dst = sg_phys(current_sg); dst = sg_dma_address(current_sg);
l_phys = ALIGN(lli_phys + (lli - lli_sg) * l_phys = ALIGN(lli_phys + (lli - lli_sg) *
sizeof(struct d40_phy_lli), D40_LLI_ALIGN); sizeof(struct d40_phy_lli), D40_LLI_ALIGN);
@@ -416,7 +416,7 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
if (direction == DMA_TO_DEVICE) { if (direction == DMA_TO_DEVICE) {
lli_src = lli_src =
d40_log_buf_to_lli(lli_src, d40_log_buf_to_lli(lli_src,
sg_phys(current_sg), sg_dma_address(current_sg),
sg_dma_len(current_sg), sg_dma_len(current_sg),
lcsp->lcsp1, src_data_width, lcsp->lcsp1, src_data_width,
dst_data_width, dst_data_width,
@@ -431,7 +431,7 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
} else { } else {
lli_dst = lli_dst =
d40_log_buf_to_lli(lli_dst, d40_log_buf_to_lli(lli_dst,
sg_phys(current_sg), sg_dma_address(current_sg),
sg_dma_len(current_sg), sg_dma_len(current_sg),
lcsp->lcsp3, dst_data_width, lcsp->lcsp3, dst_data_width,
src_data_width, src_data_width,
@@ -491,7 +491,7 @@ int d40_log_sg_to_lli(struct scatterlist *sg,
for_each_sg(sg, current_sg, sg_len, i) { for_each_sg(sg, current_sg, sg_len, i) {
total_size += sg_dma_len(current_sg); total_size += sg_dma_len(current_sg);
lli = d40_log_buf_to_lli(lli, lli = d40_log_buf_to_lli(lli,
sg_phys(current_sg), sg_dma_address(current_sg),
sg_dma_len(current_sg), sg_dma_len(current_sg),
lcsp13, lcsp13,
data_width1, data_width2, true); data_width1, data_width2, true);