OSDN Git Service

media: i2c: Fix pm_runtime_get_if_in_use() usage in sensor drivers
authorSakari Ailus <sakari.ailus@linux.intel.com>
Mon, 30 Jul 2018 11:44:43 +0000 (07:44 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Fri, 31 Aug 2018 13:23:53 +0000 (09:23 -0400)
pm_runtime_get_if_in_use() returns -EINVAL if runtime PM is disabled. This
should not be considered an error. Generally the driver has enabled
runtime PM already so getting this error due to runtime PM being disabled
will not happen.

Instead of checking for lesser or equal to zero, check for zero only.
Address this for drivers where this pattern exists.

This patch has been produced using the following command:

$ git grep -l pm_runtime_get_if_in_use -- drivers/media/i2c/ | \
  xargs perl -i -pe 's/(pm_runtime_get_if_in_use\(.*\)) \<\= 0/!$1/'

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/i2c/ov13858.c
drivers/media/i2c/ov2685.c
drivers/media/i2c/ov5670.c
drivers/media/i2c/ov5695.c
drivers/media/i2c/ov7740.c

index 5f60125..c8bbc1f 100644 (file)
@@ -1230,7 +1230,7 @@ static int ov13858_set_ctrl(struct v4l2_ctrl *ctrl)
         * Applying V4L2 control value only happens
         * when power is up for streaming
         */
-       if (pm_runtime_get_if_in_use(&client->dev) <= 0)
+       if (!pm_runtime_get_if_in_use(&client->dev))
                return 0;
 
        ret = 0;
index 385c188..98a1f2e 100644 (file)
@@ -549,7 +549,7 @@ static int ov2685_set_ctrl(struct v4l2_ctrl *ctrl)
                break;
        }
 
-       if (pm_runtime_get_if_in_use(&client->dev) <= 0)
+       if (!pm_runtime_get_if_in_use(&client->dev))
                return 0;
 
        switch (ctrl->id) {
index 5ece90e..041fcbb 100644 (file)
@@ -2016,7 +2016,7 @@ static int ov5670_set_ctrl(struct v4l2_ctrl *ctrl)
        }
 
        /* V4L2 controls values will be applied only when power is already up */
-       if (pm_runtime_get_if_in_use(&client->dev) <= 0)
+       if (!pm_runtime_get_if_in_use(&client->dev))
                return 0;
 
        switch (ctrl->id) {
index 9a80dec..5d107c5 100644 (file)
@@ -1110,7 +1110,7 @@ static int ov5695_set_ctrl(struct v4l2_ctrl *ctrl)
                break;
        }
 
-       if (pm_runtime_get_if_in_use(&client->dev) <= 0)
+       if (!pm_runtime_get_if_in_use(&client->dev))
                return 0;
 
        switch (ctrl->id) {
index 605f3e2..6e9c233 100644 (file)
@@ -510,7 +510,7 @@ static int ov7740_set_ctrl(struct v4l2_ctrl *ctrl)
        int ret;
        u8 val = 0;
 
-       if (pm_runtime_get_if_in_use(&client->dev) <= 0)
+       if (!pm_runtime_get_if_in_use(&client->dev))
                return 0;
 
        switch (ctrl->id) {