summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-04-26 14:26:43 +0200
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-05-20 16:02:44 +0200
commit10f05966c52052c06ec4303ffc2f8185df713784 (patch)
treef77f791c92826c0e490ed0d3c137ab20ab8ea0a7
parent334fe327a8b4fdebea14af478f7f6185d45e566b (diff)
media: hantro: use pm_runtime_resume_and_get()
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. While there's nothing wrong with the current usage on this driver, as we're getting rid of the pm_runtime_get_sync() call all over the media subsystem, let's remove the last occurrence on this driver. Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
-rw-r--r--drivers/staging/media/hantro/hantro_drv.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c
index 85dcb0882afc..074b9bb30d6d 100644
--- a/drivers/staging/media/hantro/hantro_drv.c
+++ b/drivers/staging/media/hantro/hantro_drv.c
@@ -160,11 +160,9 @@ static void device_run(void *priv)
src = hantro_get_src_buf(ctx);
dst = hantro_get_dst_buf(ctx);
- ret = pm_runtime_get_sync(ctx->dev->dev);
- if (ret < 0) {
- pm_runtime_put_noidle(ctx->dev->dev);
+ ret = pm_runtime_resume_and_get(ctx->dev->dev);
+ if (ret < 0)
goto err_cancel_job;
- }
ret = clk_bulk_enable(ctx->dev->variant->num_clocks, ctx->dev->clocks);
if (ret)