summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2011-01-17 22:39:24 +0800
committerDan Williams <dan.j.williams@intel.com>2011-01-29 22:35:10 -0800
commitd718f4ebddcb0bebdbf771a6672756b666e5c31b (patch)
treeb1e7e6470f16b799d41d1e942cf0ff7ac38eec63 /drivers/dma
parent939fd4f077269dd863cd630a3b3195a20acf7d02 (diff)
downloadlinux-stable-d718f4ebddcb0bebdbf771a6672756b666e5c31b.tar.gz
linux-stable-d718f4ebddcb0bebdbf771a6672756b666e5c31b.tar.bz2
linux-stable-d718f4ebddcb0bebdbf771a6672756b666e5c31b.zip
dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie()
Variable name sdma and sdmac are consistently used as the pointer to sdma_engine and sdma_channel respectively throughout the file. The patch fixes the inconsistency seen in function sdma_assign_cookie(). Signed-off-by: Shawn Guo <shawn.guo@freescale.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/dma')
-rw-r--r--drivers/dma/imx-sdma.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 1dbaf61eea2d..e89fd1033df9 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -770,15 +770,15 @@ static void sdma_enable_channel(struct sdma_engine *sdma, int channel)
__raw_writel(1 << channel, sdma->regs + SDMA_H_START);
}
-static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdma)
+static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdmac)
{
- dma_cookie_t cookie = sdma->chan.cookie;
+ dma_cookie_t cookie = sdmac->chan.cookie;
if (++cookie < 0)
cookie = 1;
- sdma->chan.cookie = cookie;
- sdma->desc.cookie = cookie;
+ sdmac->chan.cookie = cookie;
+ sdmac->desc.cookie = cookie;
return cookie;
}