lkml.org 
[lkml]   [2021]   [Apr]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 72/78] media: s3c-camif: use pm_runtime_resume_and_get()
From
Date
Hi Mauro,

On 24.04.2021 08:45, Mauro Carvalho Chehab wrote:
> 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/s3c-camif/camif-capture.c | 5 ++---
> drivers/media/platform/s3c-camif/camif-core.c | 5 +++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
> index 9ca49af29542..01fa08065ebc 100644
> --- a/drivers/media/platform/s3c-camif/camif-capture.c
> +++ b/drivers/media/platform/s3c-camif/camif-capture.c
> @@ -547,16 +547,15 @@ static int s3c_camif_open(struct file *file)
> if (ret < 0)
> goto unlock;
>
> - ret = pm_runtime_get_sync(camif->dev);
> + ret = pm_runtime_resume_and_get(camif->dev);
> if (ret < 0)

> - goto err_pm;
> + goto unlock;

I think we don't need that label change, fh still needs to be released
in case of an error.

> ret = sensor_set_power(camif, 1);
> if (!ret)
> goto unlock;
>
> pm_runtime_put(camif->dev);
> -err_pm:
> v4l2_fh_release(file);
> unlock:
> mutex_unlock(&camif->lock);

--
Regards,
Sylwester

\
 
 \ /
  Last update: 2021-04-25 21:37    [W:0.393 / U:0.976 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site