[PATCH 64/78] media: core: use pm_runtime_resume_and_get()

From: Mauro Carvalho Chehab
Date: Sat Apr 24 2021 - 02:50:15 EST


Commit dd8088d5a896 ("PM: runtime: Add pm_runtime_resume_and_get to deal with usage counter")
added pm_runtime_resume_and_get() in order to automatically handle
dev->power.usage_count decrement on errors.

Use the new API, in order to cleanup the error check logic.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx>
---
drivers/media/platform/qcom/venus/core.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 54bac7ec14c5..c156320fa256 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -84,7 +84,7 @@ static void venus_sys_error_handler(struct work_struct *work)
container_of(work, struct venus_core, work.work);
int ret = 0;

- pm_runtime_get_sync(core->dev);
+ pm_runtime_resume_and_get(core->dev);

hfi_core_deinit(core, true);

@@ -106,7 +106,7 @@ static void venus_sys_error_handler(struct work_struct *work)

hfi_reinit(core);

- pm_runtime_get_sync(core->dev);
+ pm_runtime_resume_and_get(core->dev);

ret |= venus_boot(core);
ret |= hfi_core_resume(core, true);
@@ -305,21 +305,21 @@ static int venus_probe(struct platform_device *pdev)

pm_runtime_enable(dev);

- ret = pm_runtime_get_sync(dev);
+ ret = pm_runtime_resume_and_get(dev);
if (ret < 0)
goto err_runtime_disable;

ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
if (ret)
- goto err_runtime_disable;
+ goto err_pm;

ret = venus_firmware_init(core);
if (ret)
- goto err_runtime_disable;
+ goto err_pm;

ret = venus_boot(core);
if (ret)
- goto err_runtime_disable;
+ goto err_pm;

ret = hfi_core_resume(core, true);
if (ret)
@@ -351,8 +351,9 @@ static int venus_probe(struct platform_device *pdev)
v4l2_device_unregister(&core->v4l2_dev);
err_venus_shutdown:
venus_shutdown(core);
-err_runtime_disable:
+err_pm:
pm_runtime_put_noidle(dev);
+err_runtime_disable:
pm_runtime_set_suspended(dev);
pm_runtime_disable(dev);
hfi_destroy(core);
@@ -371,7 +372,7 @@ static int venus_remove(struct platform_device *pdev)
struct device *dev = core->dev;
int ret;

- ret = pm_runtime_get_sync(dev);
+ ret = pm_runtime_resume_and_get(dev);
WARN_ON(ret < 0);

ret = hfi_core_deinit(core, true);
@@ -403,7 +404,7 @@ static void venus_core_shutdown(struct platform_device *pdev)
{
struct venus_core *core = platform_get_drvdata(pdev);

- pm_runtime_get_sync(core->dev);
+ pm_runtime_resume_and_get(core->dev);
venus_shutdown(core);
venus_firmware_deinit(core);
pm_runtime_put_sync(core->dev);
--
2.30.2