linux-mmc.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] mmc: sh_mmcif: Make sure the device stays active when needed in ->probe()
@ 2016-02-11 12:59 Ulf Hansson
  2016-02-11 12:59 ` [PATCH 2/3] mmc: sh_mmcif: Restructure ->set_ios() Ulf Hansson
                   ` (2 more replies)
  0 siblings, 3 replies; 8+ messages in thread
From: Ulf Hansson @ 2016-02-11 12:59 UTC (permalink / raw)
  To: linux-mmc, Ulf Hansson
  Cc: Kuninori Morimoto, Geert Uytterhoeven, Nguyen Viet Dung,
	Magnus Damm, Simon Horman, Laurent Pinchart

While accessing the device, make sure it stays active by increasing the
runtime PM usage count for it.

Let's also defer to enable runtime PM until we really need access to the
device. This also enables the error path in ->probe() to become simpler.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
---
 drivers/mmc/host/sh_mmcif.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c
index 8d870ce..c6c2a08 100644
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@ -1519,23 +1519,23 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, host);
 
-	pm_runtime_enable(dev);
-	host->power = false;
-
 	host->clk = devm_clk_get(dev, NULL);
 	if (IS_ERR(host->clk)) {
 		ret = PTR_ERR(host->clk);
 		dev_err(dev, "cannot get clock: %d\n", ret);
-		goto err_pm;
+		goto err_host;
 	}
 
 	ret = clk_prepare_enable(host->clk);
 	if (ret < 0)
-		goto err_pm;
+		goto err_host;
 
 	sh_mmcif_clk_setup(host);
 
-	ret = pm_runtime_resume(dev);
+	pm_runtime_enable(dev);
+	host->power = false;
+
+	ret = pm_runtime_get_sync(dev);
 	if (ret < 0)
 		goto err_clk;
 
@@ -1579,12 +1579,13 @@ static int sh_mmcif_probe(struct platform_device *pdev)
 		 sh_mmcif_readl(host->addr, MMCIF_CE_VERSION) & 0xffff,
 		 clk_get_rate(host->clk) / 1000000UL);
 
+	pm_runtime_put(dev);
 	clk_disable_unprepare(host->clk);
 	return ret;
 
 err_clk:
 	clk_disable_unprepare(host->clk);
-err_pm:
+	pm_runtime_put_sync(dev);
 	pm_runtime_disable(dev);
 err_host:
 	mmc_free_host(mmc);
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-04-05 11:11 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-11 12:59 [PATCH 1/3] mmc: sh_mmcif: Make sure the device stays active when needed in ->probe() Ulf Hansson
2016-02-11 12:59 ` [PATCH 2/3] mmc: sh_mmcif: Restructure ->set_ios() Ulf Hansson
2016-02-11 12:59 ` [PATCH 3/3] mmc: sh_mmci: Get rid of wrapper function for regulators Ulf Hansson
2016-03-03 14:59 ` [PATCH 1/3] mmc: sh_mmcif: Make sure the device stays active when needed in ->probe() Ulf Hansson
2016-03-07  3:17   ` Nguyen Viet Dung
2016-03-16  9:53     ` Ulf Hansson
2016-03-17  7:36       ` Nguyen Viet Dung
2016-04-05 11:11         ` Ulf Hansson

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).