diff options
author | Shawn Guo <shawn.guo@freescale.com> | 2011-01-17 09:39:24 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2011-01-30 01:35:10 -0500 |
commit | d718f4ebddcb0bebdbf771a6672756b666e5c31b (patch) | |
tree | b1e7e6470f16b799d41d1e942cf0ff7ac38eec63 /drivers/dma/imx-sdma.c | |
parent | 939fd4f077269dd863cd630a3b3195a20acf7d02 (diff) |
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/imx-sdma.c')
-rw-r--r-- | drivers/dma/imx-sdma.c | 8 |
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) | |||
770 | __raw_writel(1 << channel, sdma->regs + SDMA_H_START); | 770 | __raw_writel(1 << channel, sdma->regs + SDMA_H_START); |
771 | } | 771 | } |
772 | 772 | ||
773 | static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdma) | 773 | static dma_cookie_t sdma_assign_cookie(struct sdma_channel *sdmac) |
774 | { | 774 | { |
775 | dma_cookie_t cookie = sdma->chan.cookie; | 775 | dma_cookie_t cookie = sdmac->chan.cookie; |
776 | 776 | ||
777 | if (++cookie < 0) | 777 | if (++cookie < 0) |
778 | cookie = 1; | 778 | cookie = 1; |
779 | 779 | ||
780 | sdma->chan.cookie = cookie; | 780 | sdmac->chan.cookie = cookie; |
781 | sdma->desc.cookie = cookie; | 781 | sdmac->desc.cookie = cookie; |
782 | 782 | ||
783 | return cookie; | 783 | return cookie; |
784 | } | 784 | } |