media:i2c: Fix more coverity issues

Fix bit shift
Remove unused code

Coverity ID 36335
Coverity ID 36346
Coverity ID 32212
Coverity ID 1706467
Coverity ID 1706468

Bug 200192387

Change-Id: I45d6c046fd1a6bcafde82cb217a3ae0a992d8735
Signed-off-by: Wenjia Zhou <wenjiaz@nvidia.com>
Reviewed-on: http://git-master/r/1317485
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Esen Chen <esenc@nvidia.com>
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Andrew Chew <achew@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Jihoon Bang <jbang@nvidia.com>

diff --git a/drivers/media/i2c/imx185.c b/drivers/media/i2c/imx185.c
index 92346fbd1fdad23942c2af8145279c3a94ea88e4..2dbd79d41eb9b7c52fe90d0303390593b1e3b12b 100644 (file)
--- a/drivers/media/i2c/imx185.c
+++ b/drivers/media/i2c/imx185.c
@@ -311,15 +311,6 @@ power_off_done:
        return 0;
 }
 
-static int imx185_power_put(struct imx185 *priv)
-{
-       struct camera_common_power_rail *pw = &priv->power;
-
-       if (unlikely(!pw))
-               return -EFAULT;
-       return 0;
-}
-
 static int imx185_power_get(struct imx185 *priv)
 {
        struct camera_common_power_rail *pw = &priv->power;
@@ -343,10 +334,6 @@ static int imx185_power_get(struct imx185 *priv)
        else
                clk_set_parent(pw->mclk, parent);
 
-       err = clk_set_rate(pw->mclk, IMX185_DEFAULT_CLK_FREQ);
-       if (!err)
-               err = clk_prepare_enable(pw->mclk);
-
        pw->reset_gpio = pdata->reset_gpio;
 
        pw->state = SWITCH_OFF;
@@ -430,9 +417,12 @@ static int imx185_s_stream(struct v4l2_subdev *sd, int enable)
                }
        }
 
-       if (test_mode)
+       if (test_mode) {
                err = imx185_write_table(priv,
                        mode_table[IMX185_MODE_TEST_PATTERN]);
+               if (err)
+                       goto exit;
+       }
 
        err = imx185_write_table(priv, mode_table[IMX185_MODE_START_STREAM]);
        if (err)
@@ -1106,9 +1096,7 @@ imx185_remove(struct i2c_client *client)
 #endif
 
        v4l2_ctrl_handler_free(&priv->ctrl_handler);
-       imx185_power_put(priv);
        camera_common_remove_debugfs(s_data);
-
        return 0;
 }
 

diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
index 64054d74828db8f71052128ea47e0c228d864ae5..5a2382ed8c948dcdc31bf950e747789817fecbb1 100644 (file)
--- a/drivers/media/i2c/imx274.c
+++ b/drivers/media/i2c/imx274.c
@@ -76,11 +76,9 @@ static const struct regmap_config sensor_regmap_config = {
        .cache_type = REGCACHE_RBTREE,
 };
 
-static int imx274_g_volatile_ctrl(struct v4l2_ctrl *ctrl);
 static int imx274_s_ctrl(struct v4l2_ctrl *ctrl);
 
 static const struct v4l2_ctrl_ops imx274_ctrl_ops = {
-       .g_volatile_ctrl = imx274_g_volatile_ctrl,
        .s_ctrl         = imx274_s_ctrl,
 };
 
@@ -721,27 +719,6 @@ error:
        return err;
 }
 
-
-static int imx274_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
-{
-       struct imx274 *priv =
-               container_of(ctrl->handler, struct imx274, ctrl_handler);
-       int err = 0;
-       return 0;
-       if (priv->power.state == SWITCH_OFF)
-               return 0;
-
-       switch (ctrl->id) {
-
-               break;
-       default:
-                       pr_err("%s: unknown ctrl id.\n", __func__);
-                       return -EINVAL;
-       }
-
-       return err;
-}
-
 static int imx274_s_ctrl(struct v4l2_ctrl *ctrl)
 {
        struct imx274 *priv =

diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c
index a90d4d09986c1566c91b4c0aea6e110341d6a415..acbec072f8488b5424bf62b9c04c5fb6c4181fe8 100644 (file)
--- a/drivers/media/i2c/ov9281.c
+++ b/drivers/media/i2c/ov9281.c
@@ -474,10 +474,10 @@ fail:
 static int ov9281_set_coarse_time(struct ov9281 *priv, s32 val)
 {
        ov9281_reg regs[4];
-       u16 coarse_time;
+       u32 coarse_time;
        int err;
 
-       coarse_time = (u16)val;
+       coarse_time = (u32)val;
 
        dev_dbg(&priv->i2c_client->dev,
                 "%s: coarse_time: %d\n", __func__, coarse_time);