aboutsummaryrefslogtreecommitdiff
path: root/drivers/dma/imx-dma.c
diff options
context:
space:
mode:
authorJavier Martin <javier.martin@vista-silicon.com>2012-03-22 14:54:11 +0100
committerVinod Koul <vinod.koul@linux.intel.com>2012-03-26 11:31:32 +0530
commita6cbb2d87d20817e555a6ffa3131bfa1cdd9ab73 (patch)
tree43e60effdc603c6f70512289b7c420ae92b417b9 /drivers/dma/imx-dma.c
parent2d9c2fc59a74e625eff795a788cacc65648290d6 (diff)
dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
Since this function is always used with 'desc' as first argument and 'desc->sg' as second argument, the latter is clearly redundant and can be removed. Signed-off-by: Javier Martin <javier.martin@vista-silicon.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Vinod Koul <vinod.koul@linux.intel.com>
Diffstat (limited to 'drivers/dma/imx-dma.c')
-rw-r--r--drivers/dma/imx-dma.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c
index 629be353c63..628b0f61ab3 100644
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
@@ -206,9 +206,10 @@ static int imxdma_hw_chain(struct imxdma_channel *imxdmac)
/*
* imxdma_sg_next - prepare next chunk for scatter-gather DMA emulation
*/
-static inline int imxdma_sg_next(struct imxdma_desc *d, struct scatterlist *sg)
+static inline int imxdma_sg_next(struct imxdma_desc *d)
{
struct imxdma_channel *imxdmac = to_imxdma_chan(d->desc.chan);
+ struct scatterlist *sg = d->sg;
unsigned long now;
now = min(d->len, sg->length);
@@ -251,7 +252,7 @@ static void imxdma_enable_hw(struct imxdma_desc *d)
d->sg = sg_next(d->sg);
if (d->sg) {
u32 tmp;
- imxdma_sg_next(d, d->sg);
+ imxdma_sg_next(d);
tmp = imx_dmav1_readl(DMA_CCR(channel));
imx_dmav1_writel(tmp | CCR_RPT | CCR_ACRPT,
DMA_CCR(channel));
@@ -365,7 +366,7 @@ static void dma_irq_handle_channel(struct imxdma_channel *imxdmac)
desc->sg = sg_next(desc->sg);
if (desc->sg) {
- imxdma_sg_next(desc, desc->sg);
+ imxdma_sg_next(desc);
tmp = imx_dmav1_readl(DMA_CCR(chno));
@@ -475,7 +476,7 @@ static int imxdma_xfer_desc(struct imxdma_desc *d)
return -EINVAL;
}
- imxdma_sg_next(d, d->sg);
+ imxdma_sg_next(d);
break;
default: