On Fri, 21 May 2021 at 03:02, Tian Tao <tiantao6@xxxxxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxxxxx>
Applied for next, thanks!
Kind regards
Uffe
> ---
> drivers/mmc/host/sdhci-omap.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c
> index 7893fd3..8f4d1f0 100644
> --- a/drivers/mmc/host/sdhci-omap.c
> +++ b/drivers/mmc/host/sdhci-omap.c
> @@ -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;
> }
>
> --
> 2.7.4
>
