Re: [PATCH 44/78] media: i2c: ov5647: use pm_runtime_resume_and_get()
From: Jacopo Mondi
Date: Sat Apr 24 2021 - 04:30:42 EST
Hi Mauro,
On Sat, Apr 24, 2021 at 08:44:54AM +0200, 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@xxxxxxxxxx>
Looks good, thanks!
Acked-by: Jacopo Mondi <jacopo@xxxxxxxxxx>
> ---
> drivers/media/i2c/ov5647.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/i2c/ov5647.c b/drivers/media/i2c/ov5647.c
> index 1cefa15729ce..38faa74755e3 100644
> --- a/drivers/media/i2c/ov5647.c
> +++ b/drivers/media/i2c/ov5647.c
> @@ -882,20 +882,20 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, int enable)
> }
>
> if (enable) {
> - ret = pm_runtime_get_sync(&client->dev);
> + ret = pm_runtime_resume_and_get(&client->dev);
> if (ret < 0)
> goto error_unlock;
>
> ret = ov5647_stream_on(sd);
> if (ret < 0) {
> dev_err(&client->dev, "stream start failed: %d\n", ret);
> - goto error_unlock;
> + goto error_pm;
> }
> } else {
> ret = ov5647_stream_off(sd);
> if (ret < 0) {
> dev_err(&client->dev, "stream stop failed: %d\n", ret);
> - goto error_unlock;
> + goto error_pm;
> }
> pm_runtime_put(&client->dev);
> }
> @@ -905,8 +905,9 @@ static int ov5647_s_stream(struct v4l2_subdev *sd, int enable)
>
> return 0;
>
> +error_pm:
> + pm_runtime_put(&client->dev);
> error_unlock:
> - pm_runtime_put(&client->dev);
> mutex_unlock(&sensor->lock);
>
> return ret;
> --
> 2.30.2
>