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 76/78] media: sun4i_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/sunxi/sun4i-csi/sun4i_v4l2.c | 7 +++----
    1 file changed, 3 insertions(+), 4 deletions(-)

    diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
    index 4785faddf630..ed6ec41b9c2d 100644
    --- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
    +++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
    @@ -206,9 +206,9 @@ static int sun4i_csi_open(struct file *file)
    if (ret)
    return ret;

    - ret = pm_runtime_get_sync(csi->dev);
    + ret = pm_runtime_resume_and_get(csi->dev);
    if (ret < 0)
    - goto err_pm_put;
    + goto err_unlock;

    ret = v4l2_pipeline_pm_get(&csi->vdev.entity);
    if (ret)
    @@ -225,8 +225,7 @@ static int sun4i_csi_open(struct file *file)
    err_pipeline_pm_put:
    v4l2_pipeline_pm_put(&csi->vdev.entity);

    -err_pm_put:
    - pm_runtime_put(csi->dev);
    +err_unlock:
    mutex_unlock(&csi->lock);

    return ret;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-04-24 08:54    [W:3.240 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site