From: shawn.guo@freescale.com (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie()
Date: Mon, 17 Jan 2011 22:39:24 +0800 [thread overview]
Message-ID: <1295275164-7824-3-git-send-email-shawn.guo@freescale.com> (raw)
In-Reply-To: <1295275164-7824-1-git-send-email-shawn.guo@freescale.com>
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>
---
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 48d0197..4eb1d29 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;
}
--
1.7.1
next prev parent reply other threads:[~2011-01-17 14:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-17 14:39 A couple of trivial fix on imx-sdma Shawn Guo
2011-01-17 14:39 ` [PATCH 1/2] dmaengine: imx-sdma: fix return of sdma_probe() Shawn Guo
2011-01-17 18:28 ` Uwe Kleine-König
2011-01-17 14:39 ` Shawn Guo [this message]
2011-01-30 6:20 ` [PATCH 2/2] dmaengine: imx-sdma: fix inconsistent naming in sdma_assign_cookie() Dan Williams
2011-01-17 14:47 ` A couple of trivial fix on imx-sdma Sascha Hauer
2011-01-19 11:13 ` [PATCH v2 1/2] dmaengine: imx-sdma: propagate error in sdma_probe() instead of returning 0 Shawn Guo
2011-01-19 7:44 ` Uwe Kleine-König
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1295275164-7824-3-git-send-email-shawn.guo@freescale.com \
--to=shawn.guo@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).