On Fri, 21 May 2021 at 02:59, 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_am654.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c > index 1fad6e4..f654afb 100644 > --- a/drivers/mmc/host/sdhci_am654.c > +++ b/drivers/mmc/host/sdhci_am654.c > @@ -809,11 +809,9 @@ static int sdhci_am654_probe(struct platform_device *pdev) > > /* Clocks are enabled using pm_runtime */ > pm_runtime_enable(dev); > - ret = pm_runtime_get_sync(dev); > - if (ret < 0) { > - pm_runtime_put_noidle(dev); > + ret = pm_runtime_resume_and_get(dev); > + if (ret) > goto pm_runtime_disable; > - } > > base = devm_platform_ioremap_resource(pdev, 1); > if (IS_ERR(base)) { > -- > 2.7.4 >