From: Vinod Koul Date: Wed, 14 Sep 2016 10:09:56 +0000 (+0530) Subject: dmaengine: ep93xx: don't use variables defined in global scope X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8f913bffb4d35718914c1ecc8c1f52c216925752;p=linux-beck.git dmaengine: ep93xx: don't use variables defined in global scope The driver uses same variable name in local and global context in a function, rename the local one for better readability. Signed-off-by: Vinod Koul --- diff --git a/drivers/dma/ep93xx_dma.c b/drivers/dma/ep93xx_dma.c index 28945cb2e62f..9833c087e63c 100644 --- a/drivers/dma/ep93xx_dma.c +++ b/drivers/dma/ep93xx_dma.c @@ -1047,11 +1047,11 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, first = NULL; for_each_sg(sgl, sg, sg_len, i) { - size_t sg_len = sg_dma_len(sg); + size_t len = sg_dma_len(sg); - if (sg_len > DMA_MAX_CHAN_BYTES) { + if (len > DMA_MAX_CHAN_BYTES) { dev_warn(chan2dev(edmac), "too big transfer size %zu\n", - sg_len); + len); goto fail; } @@ -1068,7 +1068,7 @@ ep93xx_dma_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, desc->src_addr = edmac->runtime_addr; desc->dst_addr = sg_dma_address(sg); } - desc->size = sg_len; + desc->size = len; if (!first) first = desc;