summaryrefslogtreecommitdiffstats
path: root/drivers/dma/ste_dma40_ll.c
diff options
context:
space:
mode:
authorRabin Vincent <rabin.vincent@stericsson.com>2011-01-25 11:18:13 +0100
committerDan Williams <dan.j.williams@intel.com>2011-01-30 22:27:17 -0800
commit7fe8be5a74eb058b0b48970caef83e0215f55944 (patch)
treeadfd90a8aa8b1abb5adfc0a3ccf27255c07e1020 /drivers/dma/ste_dma40_ll.c
parent594ece4dc0e8ac222945ef2048430600ad3c7644 (diff)
downloadlinux-7fe8be5a74eb058b0b48970caef83e0215f55944.tar.gz
linux-7fe8be5a74eb058b0b48970caef83e0215f55944.tar.bz2
linux-7fe8be5a74eb058b0b48970caef83e0215f55944.zip
dma40: use sg_dma_address() instead of sg_phys()
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>
Diffstat (limited to 'drivers/dma/ste_dma40_ll.c')
-rw-r--r--drivers/dma/ste_dma40_ll.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index 0b096a38322d..6f03f580c492 100644
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -272,7 +272,7 @@ int d40_phy_sg_to_lli(struct scatterlist *sg,
if (target)
dst = target;
else
- dst = sg_phys(current_sg);
+ dst = sg_dma_address(current_sg);
l_phys = ALIGN(lli_phys + (lli - lli_sg) *
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) {
lli_src =
d40_log_buf_to_lli(lli_src,
- sg_phys(current_sg),
+ sg_dma_address(current_sg),
sg_dma_len(current_sg),
lcsp->lcsp1, src_data_width,
dst_data_width,
@@ -431,7 +431,7 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
} else {
lli_dst =
d40_log_buf_to_lli(lli_dst,
- sg_phys(current_sg),
+ sg_dma_address(current_sg),
sg_dma_len(current_sg),
lcsp->lcsp3, dst_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) {
total_size += sg_dma_len(current_sg);
lli = d40_log_buf_to_lli(lli,
- sg_phys(current_sg),
+ sg_dma_address(current_sg),
sg_dma_len(current_sg),
lcsp13,
data_width1, data_width2, true);