Commit 0314339a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: rockchip/rga: use pm_runtime_resume_and_get()

Commit dd8088d5 ("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.
Reviewed-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c09ffca5
...@@ -79,9 +79,8 @@ static int rga_buf_start_streaming(struct vb2_queue *q, unsigned int count) ...@@ -79,9 +79,8 @@ static int rga_buf_start_streaming(struct vb2_queue *q, unsigned int count)
struct rockchip_rga *rga = ctx->rga; struct rockchip_rga *rga = ctx->rga;
int ret; int ret;
ret = pm_runtime_get_sync(rga->dev); ret = pm_runtime_resume_and_get(rga->dev);
if (ret < 0) { if (ret < 0) {
pm_runtime_put_noidle(rga->dev);
rga_buf_return_buffers(q, VB2_BUF_STATE_QUEUED); rga_buf_return_buffers(q, VB2_BUF_STATE_QUEUED);
return ret; return ret;
} }
......
...@@ -866,7 +866,9 @@ static int rga_probe(struct platform_device *pdev) ...@@ -866,7 +866,9 @@ static int rga_probe(struct platform_device *pdev)
goto unreg_video_dev; goto unreg_video_dev;
} }
pm_runtime_get_sync(rga->dev); ret = pm_runtime_resume_and_get(rga->dev);
if (ret < 0)
goto unreg_video_dev;
rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF; rga->version.major = (rga_read(rga, RGA_VERSION_INFO) >> 24) & 0xFF;
rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F; rga->version.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment