From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-mmc@vger.kernel.org
Cc: linux-kernel@lists.codethink.co.uk, ulf.hansson@linaro.org,
chris@printf.net, magnus.damm@opensource.se,
linus-sh@vger.kernel.org, horms@verge.net.au,
Ben Dooks <ben.dooks@codethink.co.uk>
Subject: [PATCH 3/6] mmc: sh-mmcif: use devm_ for clock management
Date: Wed, 4 Jun 2014 12:42:10 +0100 [thread overview]
Message-ID: <1401882133-11050-4-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1401882133-11050-1-git-send-email-ben.dooks@codethink.co.uk>
Use the devm_clk_get() code to get the clock and allow it to be freed
automatically on release.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
drivers/mmc/host/sh_mmcif.c | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 3ed54c8..ae278a5 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1389,7 +1389,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
ret = mmc_of_parse(mmc);
if (ret < 0)
- goto eofparse;
+ goto err_host;
host = mmc_priv(mmc);
host->mmc = mmc;
@@ -1419,19 +1419,19 @@ static int sh_mmcif_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev);
host->power = false;
- host->hclk = clk_get(&pdev->dev, NULL);
+ host->hclk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(host->hclk)) {
ret = PTR_ERR(host->hclk);
dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
- goto eclkget;
+ goto err_pm;
}
ret = sh_mmcif_clk_update(host);
if (ret < 0)
- goto eclkupdate;
+ goto err_pm;
ret = pm_runtime_resume(&pdev->dev);
if (ret < 0)
- goto eresume;
+ goto err_clk;
INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work);
@@ -1482,13 +1482,11 @@ ereqirq1:
free_irq(irq[0], host);
ereqirq0:
pm_runtime_suspend(&pdev->dev);
-eresume:
+err_clk:
clk_disable_unprepare(host->hclk);
-eclkupdate:
- clk_put(host->hclk);
-eclkget:
+err_pm:
pm_runtime_disable(&pdev->dev);
-eofparse:
+err_host:
mmc_free_host(mmc);
return ret;
}
--
2.0.0.rc2
next prev parent reply other threads:[~2014-06-04 11:42 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-04 11:42 resend - sh mmcif driver cleanup patch series Ben Dooks
2014-06-04 11:42 ` [PATCH 1/6] mmc: sh-mmcif: update to print version and bus clock rate on probe Ben Dooks
2014-06-04 12:57 ` Ulf Hansson
2014-06-04 11:42 ` [PATCH 2/6] mmc: sh-mmcif: use devm_ for ioremap Ben Dooks
2014-06-04 12:58 ` Ulf Hansson
2014-06-04 11:42 ` Ben Dooks [this message]
2014-06-04 12:59 ` [PATCH 3/6] mmc: sh-mmcif: use devm_ for clock management Ulf Hansson
2014-06-04 11:42 ` [PATCH 4/6] mmc: sh-mmcif: use devm_ for irq management Ben Dooks
2014-06-04 13:00 ` Ulf Hansson
2014-06-04 11:42 ` [PATCH 5/6] mmc: sh-mmcif: no need to call pm_runtime_suspend on error Ben Dooks
2014-06-04 13:01 ` Ulf Hansson
2014-06-04 11:42 ` [PATCH 6/6] mmc: sh-mmcif: final error path cleanup Ben Dooks
2014-06-04 13:02 ` Ulf Hansson
2014-06-16 8:51 ` resend - sh mmcif driver cleanup patch series Ulf Hansson
-- strict thread matches above, loose matches on Subject: below --
2014-04-01 10:25 cleanups for sh-mmcif driver Ben Dooks
2014-04-01 10:25 ` [PATCH 3/6] mmc: sh-mmcif: use devm_ for clock management Ben Dooks
2014-04-01 10:59 ` Geert Uytterhoeven
2014-04-01 11:25 ` Ben Dooks
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=1401882133-11050-4-git-send-email-ben.dooks@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--cc=chris@printf.net \
--cc=horms@verge.net.au \
--cc=linus-sh@vger.kernel.org \
--cc=linux-kernel@lists.codethink.co.uk \
--cc=linux-mmc@vger.kernel.org \
--cc=magnus.damm@opensource.se \
--cc=ulf.hansson@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;
as well as URLs for NNTP newsgroup(s).