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 75/78] media: stm32: 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/stm32/stm32-dcmi.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/media/platform/stm32/stm32-dcmi.c b/drivers/media/platform/stm32/stm32-dcmi.c
    index bbcc2254fa2e..5f4e1db8cfcd 100644
    --- a/drivers/media/platform/stm32/stm32-dcmi.c
    +++ b/drivers/media/platform/stm32/stm32-dcmi.c
    @@ -723,11 +723,11 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)
    u32 val = 0;
    int ret;

    - ret = pm_runtime_get_sync(dcmi->dev);
    + ret = pm_runtime_resume_and_get(dcmi->dev);
    if (ret < 0) {
    dev_err(dcmi->dev, "%s: Failed to start streaming, cannot get sync (%d)\n",
    __func__, ret);
    - goto err_pm_put;
    + goto err_unlock;
    }

    ret = media_pipeline_start(&dcmi->vdev->entity, &dcmi->pipeline);
    @@ -848,6 +848,7 @@ static int dcmi_start_streaming(struct vb2_queue *vq, unsigned int count)

    err_pm_put:
    pm_runtime_put(dcmi->dev);
    +err_unlock:
    spin_lock_irq(&dcmi->irqlock);
    /*
    * Return all buffers to vb2 in QUEUED state.
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-04-24 08:52    [W:4.026 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site