media: i2c: tvp5150: 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/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index e26e3f5..374a9da 100644 (file)
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -1448,11 +1448,9 @@ static int tvp5150_s_stream(struct v4l2_subdev *sd, int enable)
               TVP5150_MISC_CTL_CLOCK_OE;
 
        if (enable) {
-               ret = pm_runtime_get_sync(sd->dev);
-               if (ret < 0) {
-                       pm_runtime_put_noidle(sd->dev);
+               ret = pm_runtime_resume_and_get(sd->dev);
+               if (ret < 0)
                        return ret;
-               }
 
                tvp5150_enable(sd);
 
@@ -1675,15 +1673,7 @@ err:
 
 static int tvp5150_open(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
 {
-       int ret;
-
-       ret = pm_runtime_get_sync(sd->dev);
-       if (ret < 0) {
-               pm_runtime_put_noidle(sd->dev);
-               return ret;
-       }
-
-       return 0;
+       return pm_runtime_resume_and_get(sd->dev);
 }
 
 static int tvp5150_close(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)