lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 096/236] media: rockchip/rga: use pm_runtime_resume_and_get()
    Date
    From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

    [ Upstream commit 0314339a0a49f4a128b61e5e1a0af1df6e64a186 ]

    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 <ezequiel@collabora.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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;
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-13 15:40    [W:4.871 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site