On Wed, 28 Apr 2021 16:51:47 +0200
Mauro Carvalho Chehab <mchehab+huawei@xxxxxxxxxx> 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>
NOP patch so
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> drivers/staging/media/tegra-video/csi.c | 3 +--
> drivers/staging/media/tegra-video/vi.c | 3 +--
> 2 files changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c
> index 033a6935c26d..e938bf4c48b6 100644
> --- a/drivers/staging/media/tegra-video/csi.c
> +++ b/drivers/staging/media/tegra-video/csi.c
> @@ -298,10 +298,9 @@ static int tegra_csi_enable_stream(struct v4l2_subdev *subdev)
> struct tegra_csi *csi = csi_chan->csi;
> int ret, err;
>
> - ret = pm_runtime_get_sync(csi->dev);
> + ret = pm_runtime_resume_and_get(csi->dev);
> if (ret < 0) {
> dev_err(csi->dev, "failed to get runtime PM: %d\n", ret);
> - pm_runtime_put_noidle(csi->dev);
> return ret;
> }
>
> diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c
> index 7a09061cda57..1298740a9c6c 100644
> --- a/drivers/staging/media/tegra-video/vi.c
> +++ b/drivers/staging/media/tegra-video/vi.c
> @@ -297,10 +297,9 @@ static int tegra_channel_start_streaming(struct vb2_queue *vq, u32 count)
> struct tegra_vi_channel *chan = vb2_get_drv_priv(vq);
> int ret;
>
> - ret = pm_runtime_get_sync(chan->vi->dev);
> + ret = pm_runtime_resume_and_get(chan->vi->dev);
> if (ret < 0) {
> dev_err(chan->vi->dev, "failed to get runtime PM: %d\n", ret);
> - pm_runtime_put_noidle(chan->vi->dev);
> return ret;
> }
>
