staging: media: imx7-mipi-csis: use pm_runtime_resume_and_get()

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.

Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/imx/imx7-mipi-csis.c b/drivers/staging/media/imx/imx7-mipi-csis.c
index 025fdc4..1dc680d 100644 (file)
--- a/drivers/staging/media/imx/imx7-mipi-csis.c
+++ b/drivers/staging/media/imx/imx7-mipi-csis.c
@@ -695,11 +695,10 @@ static int mipi_csis_s_stream(struct v4l2_subdev *mipi_sd, int enable)
 
                mipi_csis_clear_counters(state);
 
-               ret = pm_runtime_get_sync(&state->pdev->dev);
-               if (ret < 0) {
-                       pm_runtime_put_noidle(&state->pdev->dev);
+               ret = pm_runtime_resume_and_get(&state->pdev->dev);
+               if (ret < 0)
                        return ret;
-               }
+
                ret = v4l2_subdev_call(state->src_sd, core, s_power, 1);
                if (ret < 0 && ret != -ENOIOCTLCMD)
                        goto done;