lkml.org 
[lkml]   [2021]   [Apr]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 74/78] media: bdisp-v4l2: use pm_runtime_resume_and_get()
    Date
    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@kernel.org>
    ---
    drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
    index 060ca85f64d5..85288da9d2ae 100644
    --- a/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
    +++ b/drivers/media/platform/sti/bdisp/bdisp-v4l2.c
    @@ -499,7 +499,7 @@ static int bdisp_start_streaming(struct vb2_queue *q, unsigned int count)
    {
    struct bdisp_ctx *ctx = q->drv_priv;
    struct vb2_v4l2_buffer *buf;
    - int ret = pm_runtime_get_sync(ctx->bdisp_dev->dev);
    + int ret = pm_runtime_resume_and_get(ctx->bdisp_dev->dev);

    if (ret < 0) {
    dev_err(ctx->bdisp_dev->dev, "failed to set runtime PM\n");
    @@ -1364,10 +1364,10 @@ static int bdisp_probe(struct platform_device *pdev)

    /* Power management */
    pm_runtime_enable(dev);
    - ret = pm_runtime_get_sync(dev);
    + ret = pm_runtime_resume_and_get(dev);
    if (ret < 0) {
    dev_err(dev, "failed to set PM\n");
    - goto err_pm;
    + goto err_remove;
    }

    /* Filters */
    @@ -1395,6 +1395,7 @@ static int bdisp_probe(struct platform_device *pdev)
    bdisp_hw_free_filters(bdisp->dev);
    err_pm:
    pm_runtime_put(dev);
    +err_remove:
    bdisp_debugfs_remove(bdisp);
    v4l2_device_unregister(&bdisp->v4l2_dev);
    err_clk:
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-04-24 08:51    [W:2.731 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site