media: sunxi: 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.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
index 4785fad..54b9099 100644 (file)
--- a/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
+++ b/drivers/media/platform/sunxi/sun4i-csi/sun4i_v4l2.c
@@ -206,9 +206,9 @@ static int sun4i_csi_open(struct file *file)
        if (ret)
                return ret;
 
-       ret = pm_runtime_get_sync(csi->dev);
+       ret = pm_runtime_resume_and_get(csi->dev);
        if (ret < 0)
-               goto err_pm_put;
+               goto err_unlock;
 
        ret = v4l2_pipeline_pm_get(&csi->vdev.entity);
        if (ret)
@@ -227,6 +227,8 @@ err_pipeline_pm_put:
 
 err_pm_put:
        pm_runtime_put(csi->dev);
+
+err_unlock:
        mutex_unlock(&csi->lock);
 
        return ret;