From: Ben Dooks <ben.dooks@codethink.co.uk>
To: linux-mmc@vger.kernel.org
Cc: linux-sh@vger.kernel.org,
Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Ulf Hansson <ulf.hansson@linaro.org>,
Chris Ball <chris@printf.net>,
Guennadi Liakhovetski <g.liakhovetski@gmx.de>,
magnus.damm@opensource.se, linux-kernel@lists.codethink.co.uk,
Ben Dooks <ben.dooks@codethink.co.uk>
Subject: [PATCH 5/6] mmc: sh-mmcif: no need to call pm_runtime_suspend on error
Date: Tue, 1 Apr 2014 11:25:53 +0100 [thread overview]
Message-ID: <1396347954-13740-6-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1396347954-13740-1-git-send-email-ben.dooks@codethink.co.uk>
The pm_runtime call should implicitly disable the device once the
probe is over if there is no explicit reference gained. There is no
need to call pm_runtime_suspend() before the pm_runtime_disable()
call.
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
drivers/mmc/host/sh_mmcif.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 485db7b..c951760 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1447,7 +1447,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
sh_mmcif_irqt, 0, name, host);
if (ret) {
dev_err(&pdev->dev, "request_irq error (%s)\n", name);
- goto err_irq;
+ goto err_clk;
}
if (irq[1] >= 0) {
ret = devm_request_threaded_irq(&pdev->dev, irq[1],
@@ -1455,7 +1455,7 @@ static int sh_mmcif_probe(struct platform_device *pdev)
0, "sh_mmc:int", host);
if (ret) {
dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
- goto err_irq;
+ goto err_clk;
}
}
@@ -1482,8 +1482,6 @@ static int sh_mmcif_probe(struct platform_device *pdev)
emmcaddh:
erqcd:
-err_irq:
- pm_runtime_suspend(&pdev->dev);
err_clk:
clk_disable_unprepare(host->hclk);
err_pm:
--
1.9.0
next prev parent reply other threads:[~2014-04-01 10:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-01 10:25 cleanups for sh-mmcif driver Ben Dooks
2014-04-01 10:25 ` [PATCH 1/6] mmc: sh-mmcif: print bus clock rate on probe Ben Dooks
2014-04-01 10:45 ` Geert Uytterhoeven
2014-04-01 11:08 ` Laurent Pinchart
2014-04-01 11:37 ` Ben Dooks
2014-04-01 10:25 ` [PATCH 2/6] mmc: sh-mmcif: use devm_ for ioremap Ben Dooks
2014-04-01 10:55 ` Geert Uytterhoeven
2014-04-01 10:59 ` Ben Dooks
2014-04-01 11:08 ` Laurent Pinchart
2014-04-01 11:26 ` Sergei Shtylyov
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
2014-04-01 10:25 ` [PATCH 4/6] mmc: sh-mmcif: use devm_ for irq management Ben Dooks
2014-04-01 10:25 ` Ben Dooks [this message]
2014-04-01 10:25 ` [PATCH 6/6] mmc: sh-mmcif: final error path cleanup Ben Dooks
-- strict thread matches above, loose matches on Subject: below --
2014-06-04 11:42 resend - sh mmcif driver cleanup patch series Ben Dooks
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
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=1396347954-13740-6-git-send-email-ben.dooks@codethink.co.uk \
--to=ben.dooks@codethink.co.uk \
--cc=chris@printf.net \
--cc=g.liakhovetski@gmx.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@lists.codethink.co.uk \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@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).