This is an automatic generated email to let you know that the following patch 
were queued:

Subject: media: rockchip/rga: use pm_runtime_resume_and_get()
Author:  Mauro Carvalho Chehab <[email protected]>
Date:    Fri Apr 23 17:19:20 2021 +0200

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.

Reviewed-by: Ezequiel Garcia <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>

 drivers/media/platform/rockchip/rga/rga-buf.c | 3 +--
 drivers/media/platform/rockchip/rga/rga.c     | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

---

diff --git a/drivers/media/platform/rockchip/rga/rga-buf.c 
b/drivers/media/platform/rockchip/rga/rga-buf.c
index bf9a75b75083..81508ed5abf3 100644
--- a/drivers/media/platform/rockchip/rga/rga-buf.c
+++ b/drivers/media/platform/rockchip/rga/rga-buf.c
@@ -79,9 +79,8 @@ static int rga_buf_start_streaming(struct vb2_queue *q, 
unsigned int count)
        struct rockchip_rga *rga = ctx->rga;
        int ret;
 
-       ret = pm_runtime_get_sync(rga->dev);
+       ret = pm_runtime_resume_and_get(rga->dev);
        if (ret < 0) {
-               pm_runtime_put_noidle(rga->dev);
                rga_buf_return_buffers(q, VB2_BUF_STATE_QUEUED);
                return ret;
        }
diff --git a/drivers/media/platform/rockchip/rga/rga.c 
b/drivers/media/platform/rockchip/rga/rga.c
index 9d122429706e..bf3fd71ec3af 100644
--- a/drivers/media/platform/rockchip/rga/rga.c
+++ b/drivers/media/platform/rockchip/rga/rga.c
@@ -866,7 +866,9 @@ static int rga_probe(struct platform_device *pdev)
                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.minor = (rga_read(rga, RGA_VERSION_INFO) >> 20) & 0x0F;

_______________________________________________
linuxtv-commits mailing list
[email protected]
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to