From: Zhang Qilong <zhangqilong3@huawei.com>
Date: Mon, 31 May 2021 14:25:42 +0000 (+0800)
Subject: bus: ti-sysc: using pm_runtime_resume_and_get instead of pm_runtime_get_sync
X-Git-Tag: libata-5.15-2021-09-05~36^2~12^2^2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=cea08169ad4ce46c222a223d8f71db6d9c3f1385;p=linux-block.git

bus: ti-sysc: using pm_runtime_resume_and_get instead of pm_runtime_get_sync

Using pm_runtime_resume_and_get is more appropriate
for simplifing code.

Signed-off-by: Zhang Qilong <zhangqilong3@huawei.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c
index c2e3b1c9d7af..9df1e674d3f2 100644
--- a/drivers/bus/ti-sysc.c
+++ b/drivers/bus/ti-sysc.c
@@ -3111,9 +3111,8 @@ static int sysc_probe(struct platform_device *pdev)
 		goto unprepare;
 
 	pm_runtime_enable(ddata->dev);
-	error = pm_runtime_get_sync(ddata->dev);
+	error = pm_runtime_resume_and_get(ddata->dev);
 	if (error < 0) {
-		pm_runtime_put_noidle(ddata->dev);
 		pm_runtime_disable(ddata->dev);
 		goto unprepare;
 	}
@@ -3171,9 +3170,8 @@ static int sysc_remove(struct platform_device *pdev)
 
 	cancel_delayed_work_sync(&ddata->idle_work);
 
-	error = pm_runtime_get_sync(ddata->dev);
+	error = pm_runtime_resume_and_get(ddata->dev);
 	if (error < 0) {
-		pm_runtime_put_noidle(ddata->dev);
 		pm_runtime_disable(ddata->dev);
 		goto unprepare;
 	}