diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-13 10:03:15 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2019-09-13 13:48:35 +0200 |
| commit | 8861474a105c91e812d38cd65d3be795c7f32c4f (patch) | |
| tree | bc2999c029207a93fb1f32ac2153316ea46f97c5 /drivers/mmc/host/uniphier-sd.c | |
| parent | Revert "mmc: sdhci: Remove unneeded quirk2 flag of O2 SD host controller" (diff) | |
| download | linux-8861474a105c91e812d38cd65d3be795c7f32c4f.tar.xz linux-8861474a105c91e812d38cd65d3be795c7f32c4f.zip | |
Revert "mmc: tmio: move runtime PM enablement to the driver implementations"
This reverts commit 7ff213193310ef8d0ee5f04f79d791210787ac2c.
It turns out that the above commit introduces other problems. For example,
calling pm_runtime_set_active() must not be done prior calling
pm_runtime_enable() as that makes it fail. This leads to additional
problems, such as clock enables being wrongly balanced.
Rather than fixing the problem on top, let's start over by doing a revert.
Fixes: 7ff213193310 ("mmc: tmio: move runtime PM enablement to the driver implementations")
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/mmc/host/uniphier-sd.c')
| -rw-r--r-- | drivers/mmc/host/uniphier-sd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/mmc/host/uniphier-sd.c b/drivers/mmc/host/uniphier-sd.c index 49aad9a79c18..91a2be41edf6 100644 --- a/drivers/mmc/host/uniphier-sd.c +++ b/drivers/mmc/host/uniphier-sd.c @@ -631,7 +631,6 @@ static int uniphier_sd_probe(struct platform_device *pdev) host->clk_disable = uniphier_sd_clk_disable; host->set_clock = uniphier_sd_set_clock; - pm_runtime_enable(&pdev->dev); ret = uniphier_sd_clk_enable(host); if (ret) goto free_host; @@ -653,7 +652,6 @@ static int uniphier_sd_probe(struct platform_device *pdev) free_host: tmio_mmc_host_free(host); - pm_runtime_disable(&pdev->dev); return ret; } @@ -664,7 +662,6 @@ static int uniphier_sd_remove(struct platform_device *pdev) tmio_mmc_host_remove(host); uniphier_sd_clk_disable(host); - pm_runtime_disable(&pdev->dev); return 0; } |