From: Fabio Estevam <festevam@gmail.com>
To: cjb@laptop.org
Cc: shawn.guo@linaro.org, kernel@pengutronix.de,
linux-mmc@vger.kernel.org, Fabio Estevam <festevam@gmail.com>
Subject: [PATCH 1/2] mmc: mxs-mmc: Use devm_clk_get()
Date: Wed, 3 Jul 2013 17:02:37 -0300 [thread overview]
Message-ID: <1372881758-23502-1-git-send-email-festevam@gmail.com> (raw)
Using devm_clk_get() allows us to remove the clk_put() calls, so let's use it
to simplify the code.
Rename the 'out_clk_put' label to 'out_clk_disable' now that clk_put is removed.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
drivers/mmc/host/mxs-mmc.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/host/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index f38d75f..b76778f 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -618,7 +618,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
}
}
- ssp->clk = clk_get(&pdev->dev, NULL);
+ ssp->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(ssp->clk)) {
ret = PTR_ERR(ssp->clk);
goto out_mmc_free;
@@ -632,7 +632,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
dev_err(mmc_dev(host->mmc),
"%s: failed to request dma\n", __func__);
ret = -ENODEV;
- goto out_clk_put;
+ goto out_clk_disable;
}
/* set mmc core parameters */
@@ -685,9 +685,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
out_free_dma:
if (ssp->dmach)
dma_release_channel(ssp->dmach);
-out_clk_put:
+out_clk_disable:
clk_disable_unprepare(ssp->clk);
- clk_put(ssp->clk);
out_mmc_free:
mmc_free_host(mmc);
return ret;
@@ -705,7 +704,6 @@ static int mxs_mmc_remove(struct platform_device *pdev)
dma_release_channel(ssp->dmach);
clk_disable_unprepare(ssp->clk);
- clk_put(ssp->clk);
mmc_free_host(mmc);
--
1.8.1.2
next reply other threads:[~2013-07-03 20:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-03 20:02 Fabio Estevam [this message]
2013-07-03 20:02 ` [PATCH 2/2] mmc: mxs-mmc: Check the return value from stmp_reset_block() Fabio Estevam
2013-07-04 1:27 ` [PATCH 1/2] mmc: mxs-mmc: Use devm_clk_get() Shawn Guo
2013-08-25 2:07 ` Chris Ball
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=1372881758-23502-1-git-send-email-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=cjb@laptop.org \
--cc=kernel@pengutronix.de \
--cc=linux-mmc@vger.kernel.org \
--cc=shawn.guo@linaro.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