lkml.org 
[lkml]   [2021]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 68/79] media: venus: venc: 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/qcom/venus/venc.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
    index 4a7291f934b6..8dd49d4f124c 100644
    --- a/drivers/media/platform/qcom/venus/venc.c
    +++ b/drivers/media/platform/qcom/venus/venc.c
    @@ -1205,9 +1205,9 @@ static int venc_open(struct file *file)

    venus_helper_init_instance(inst);

    - ret = pm_runtime_get_sync(core->dev_enc);
    + ret = pm_runtime_resume_and_get(core->dev_enc);
    if (ret < 0)
    - goto err_put_sync;
    + goto err_free;

    ret = venc_ctrl_init(inst);
    if (ret)
    @@ -1252,6 +1252,7 @@ static int venc_open(struct file *file)
    venc_ctrl_deinit(inst);
    err_put_sync:
    pm_runtime_put_sync(core->dev_enc);
    +err_free:
    kfree(inst);
    return ret;
    }
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-04-27 12:39    [W:3.451 / U:0.116 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site