Skip to content

Commit

Permalink
dmaengine: imx-dma: remove unused arg of imxdma_sg_next.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Javier Martin authored and Vinod Koul committed Mar 26, 2012
1 parent 2d9c2fc commit a6cbb2d
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/dma/imx-dma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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));

Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit a6cbb2d

Please sign in to comment.