From: Richard Zhao <richard.zhao@linaro.org>
To: <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>
Cc: <dan.j.williams@intel.com>, <vinod.koul@intel.com>,
<shawn.guo@linaro.org>, <kernel@pengutronix.de>,
<eric.miao@linaro.org>, <patches@linaro.org>,
Richard Zhao <richard.zhao@linaro.org>
Subject: [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel
Date: Mon, 9 Jan 2012 16:49:00 +0800 [thread overview]
Message-ID: <1326098940-3697-2-git-send-email-richard.zhao@linaro.org> (raw)
In-Reply-To: <1326098940-3697-1-git-send-email-richard.zhao@linaro.org>
It makes clk_enable/disable pair more readable, and fix one bug:
sdma_init calls sdma_request_channel, but seems don't know
sdma_request_channel enabled the clok.
Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
---
drivers/dma/imx-sdma.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c
index 6376009..2a0e02d 100644
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@ -802,8 +802,6 @@ static int sdma_request_channel(struct sdma_channel *sdmac)
sdma->channel_control[channel].base_bd_ptr = sdmac->bd_phys;
sdma->channel_control[channel].current_bd_ptr = sdmac->bd_phys;
- clk_enable(sdma->clk);
-
sdma_set_channel_priority(sdmac, MXC_SDMA_DEFAULT_PRIORITY);
init_completion(&sdmac->done);
@@ -875,6 +873,9 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan)
sdmac->peripheral_type = data->peripheral_type;
sdmac->event_id0 = data->dma_request;
+
+ clk_enable(sdmac->sdma->clk);
+
ret = sdma_request_channel(sdmac);
if (ret)
return ret;
--
1.7.5.4
next prev parent reply other threads:[~2012-01-09 8:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-09 8:48 [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Richard Zhao
2012-01-09 8:49 ` Richard Zhao [this message]
2012-01-10 3:09 ` [PATCH 2/2] dma/imx-sdma: move clk_enable out of sdma_request_channel Shawn Guo
2012-01-10 3:02 ` [PATCH 1/2] dma/imx-sdma: call sdma_set_channel_priority after sdma_request_channel Shawn Guo
2012-01-10 6:34 ` Richard Zhao
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=1326098940-3697-2-git-send-email-richard.zhao@linaro.org \
--to=richard.zhao@linaro.org \
--cc=dan.j.williams@intel.com \
--cc=eric.miao@linaro.org \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@linaro.org \
--cc=shawn.guo@linaro.org \
--cc=vinod.koul@intel.com \
/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).