lkml.org 
[lkml]   [2011]   [Jan]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 22/32] dma40: combine duplicated code in log_sg_to_dev
Date
From: Rabin Vincent <rabin.vincent@stericsson.com>

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>
---
drivers/dma/ste_dma40_ll.c | 52 +++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/drivers/dma/ste_dma40_ll.c b/drivers/dma/ste_dma40_ll.c
index fd75251..fa6c3ab 100644
--- a/drivers/dma/ste_dma40_ll.c
+++ b/drivers/dma/ste_dma40_ll.c
@@ -385,40 +385,34 @@ int d40_log_sg_to_dev(struct scatterlist *sg,
struct d40_log_lli *lli_dst = lli->dst;

for_each_sg(sg, current_sg, sg_len, i) {
- total_size += sg_dma_len(current_sg);
+ dma_addr_t sg_addr = sg_dma_address(current_sg);
+ unsigned int len = sg_dma_len(current_sg);
+ dma_addr_t src;
+ dma_addr_t dst;
+
+ total_size += len;

if (direction == DMA_TO_DEVICE) {
- lli_src =
- d40_log_buf_to_lli(lli_src,
- sg_dma_address(current_sg),
- sg_dma_len(current_sg),
- lcsp->lcsp1, src_data_width,
- dst_data_width,
- true);
- lli_dst =
- d40_log_buf_to_lli(lli_dst,
- dev_addr,
- sg_dma_len(current_sg),
- lcsp->lcsp3, dst_data_width,
- src_data_width,
- false);
+ src = sg_addr;
+ dst = dev_addr;
} else {
- lli_dst =
- d40_log_buf_to_lli(lli_dst,
- sg_dma_address(current_sg),
- sg_dma_len(current_sg),
- lcsp->lcsp3, dst_data_width,
- src_data_width,
- true);
- lli_src =
- d40_log_buf_to_lli(lli_src,
- dev_addr,
- sg_dma_len(current_sg),
- lcsp->lcsp1, src_data_width,
- dst_data_width,
- false);
+ src = dev_addr;
+ dst = sg_addr;
}
+
+ lli_src = d40_log_buf_to_lli(lli_src, src, len,
+ lcsp->lcsp1,
+ src_data_width,
+ dst_data_width,
+ src == sg_addr);
+
+ lli_dst = d40_log_buf_to_lli(lli_dst, dst, len,
+ lcsp->lcsp3,
+ dst_data_width,
+ src_data_width,
+ dst == sg_addr);
}
+
return total_size;
}

--
1.7.3.2


\
 
 \ /
  Last update: 2011-01-25 11:35    [W:0.125 / U:0.128 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site