mmc: sdhci-omap: Use pm_runtime_resume_and_get() to replace open coding
authorTian Tao <tiantao6@hisilicon.com>
Fri, 21 May 2021 01:02:45 +0000 (09:02 +0800)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 14 Jun 2021 11:57:41 +0000 (13:57 +0200)
use pm_runtime_resume_and_get() to replace pm_runtime_get_sync and
pm_runtime_put_noidle. this change is just to simplify the code, no
actual functional changes.

Signed-off-by: Tian Tao <tiantao6@hisilicon.com>
Link: https://lore.kernel.org/r/1621558965-34077-1-git-send-email-tiantao6@hisilicon.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/sdhci-omap.c

index 7893fd3..8f4d1f0 100644 (file)
@@ -1173,10 +1173,9 @@ static int sdhci_omap_probe(struct platform_device *pdev)
         * as part of pm_runtime_get_sync.
         */
        pm_runtime_enable(dev);
-       ret = pm_runtime_get_sync(dev);
-       if (ret < 0) {
+       ret = pm_runtime_resume_and_get(dev);
+       if (ret) {
                dev_err(dev, "pm_runtime_get_sync failed\n");
-               pm_runtime_put_noidle(dev);
                goto err_rpm_disable;
        }