From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Tue, 17 Nov 2015 11:37:09 +0000 (+0200)
Subject: dmaengine: idma64: convert idma64_hw_desc_fill() to return void
X-Git-Tag: v4.5-rc1~120^2~10^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ac02979413e0310f85bbcc2945d65da7071c08fe;p=thirdparty%2Fkernel%2Flinux.git

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>
---

diff --git a/drivers/dma/idma64.c b/drivers/dma/idma64.c
index 97802be315883..b6c13f9fffb6e 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)
 	idma64_desc_free(idma64c, to_idma64_desc(vdesc));
 }
 
-static u64 idma64_hw_desc_fill(struct idma64_hw_desc *hw,
+static void idma64_hw_desc_fill(struct idma64_hw_desc *hw,
 		struct dma_slave_config *config,
 		enum dma_transfer_direction direction, u64 llp)
 {
@@ -268,7 +268,6 @@ static u64 idma64_hw_desc_fill(struct idma64_hw_desc *hw,
 		     IDMA64C_CTLL_SRC_WIDTH(src_width);
 
 	lli->llp = llp;
-	return hw->llp;
 }
 
 static void idma64_desc_fill(struct idma64_chan *idma64c,
@@ -283,7 +282,8 @@ static void idma64_desc_fill(struct idma64_chan *idma64c,
 	/* Fill the hardware descriptors and link them to a list */
 	do {
 		hw = &desc->hw[--i];
-		llp = idma64_hw_desc_fill(hw, config, desc->direction, llp);
+		idma64_hw_desc_fill(hw, config, desc->direction, llp);
+		llp = hw->llp;
 		desc->length += hw->len;
 	} while (i);