diff options
author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2015-11-17 06:37:09 -0500 |
---|---|---|
committer | Vinod Koul <vinod.koul@intel.com> | 2015-12-05 03:24:28 -0500 |
commit | ac02979413e0310f85bbcc2945d65da7071c08fe (patch) | |
tree | 9dd1081869730d4773efde96ddb11bdd6f3ad2ab | |
parent | e3fdb1894cfac6dd4a5bb24d3232fd97ddf74c93 (diff) |
dmaengine: idma64: convert idma64_hw_desc_fill() to return void
Explicitly show in idma64_desc_fill() how we link the hardware
descriptors.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
-rw-r--r-- | drivers/dma/idma64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c index 97802be31588..b6c13f9fffb6 100644 --- a/drivers/dma/idma64.c +++ b/drivers/dma/idma64.c | |||
@@ -231,7 +231,7 @@ static void idma64_vdesc_free(struct virt_dma_desc *vdesc) | |||
231 | idma64_desc_free(idma64c, to_idma64_desc(vdesc)); | 231 | idma64_desc_free(idma64c, to_idma64_desc(vdesc)); |
232 | } | 232 | } |
233 | 233 | ||
234 | static u64 idma64_hw_desc_fill(struct idma64_hw_desc *hw, | 234 | static void idma64_hw_desc_fill(struct idma64_hw_desc *hw, |
235 | struct dma_slave_config *config, | 235 | struct dma_slave_config *config, |
236 | enum dma_transfer_direction direction, u64 llp) | 236 | enum dma_transfer_direction direction, u64 llp) |
237 | { | 237 | { |
@@ -268,7 +268,6 @@ static u64 idma64_hw_desc_fill(struct idma64_hw_desc *hw, | |||
268 | IDMA64C_CTLL_SRC_WIDTH(src_width); | 268 | IDMA64C_CTLL_SRC_WIDTH(src_width); |
269 | 269 | ||
270 | lli->llp = llp; | 270 | lli->llp = llp; |
271 | return hw->llp; | ||
272 | } | 271 | } |
273 | 272 | ||
274 | static void idma64_desc_fill(struct idma64_chan *idma64c, | 273 | static void idma64_desc_fill(struct idma64_chan *idma64c, |
@@ -283,7 +282,8 @@ static void idma64_desc_fill(struct idma64_chan *idma64c, | |||
283 | /* Fill the hardware descriptors and link them to a list */ | 282 | /* Fill the hardware descriptors and link them to a list */ |
284 | do { | 283 | do { |
285 | hw = &desc->hw[--i]; | 284 | hw = &desc->hw[--i]; |
286 | llp = idma64_hw_desc_fill(hw, config, desc->direction, llp); | 285 | idma64_hw_desc_fill(hw, config, desc->direction, llp); |
286 | llp = hw->llp; | ||
287 | desc->length += hw->len; | 287 | desc->length += hw->len; |
288 | } while (i); | 288 | } while (i); |
289 | 289 | ||