This patch fixes the following:
- Got rid of unnecessary braces around single line if statements.
- End of block comments on a seperate line.
- A spelling mistake of the word "on".
Signed-off-by: Tabot Kevin <tabot.ke...@gmail.com>
---
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 25 +++-------------------
1 file changed, 3 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
index 1396a33..b70979d 100644
--- a/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
+++ b/drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
@@ -146,7 +146,6 @@ static int ov2680_g_bin_factor_x(struct v4l2_subdev *sd,
s32 *val)
struct ov2680_device *dev = to_ov2680_sensor(sd);
struct i2c_client *client = v4l2_get_subdevdata(sd);
- dev_dbg(&client->dev, "++++%s\n", __func__);
*val = ov2680_res[dev->fmt_idx].bin_factor_x;
return 0;
@@ -158,7 +157,7 @@ static int ov2680_g_bin_factor_y(struct v4l2_subdev *sd,
s32 *val)
struct i2c_client *client = v4l2_get_subdevdata(sd);
*val = ov2680_res[dev->fmt_idx].bin_factor_y;
- dev_dbg(&client->dev, "++++%s\n", __func__);
+
return 0;
}
@@ -173,7 +172,6 @@ static int ov2680_get_intg_factor(struct i2c_client *client,
u16 reg_val;
int ret;
- dev_dbg(&client->dev, "++++%s\n", __func__);
if (!info)
return -EINVAL;
@@ -250,10 +248,6 @@ static long __ov2680_set_exposure(struct v4l2_subdev *sd,
int coarse_itg,
u16 vts;
int ret, exp_val;
- dev_dbg(&client->dev,
- "+++++++%s coarse_itg %d, gain %d, digitgain %d++\n",
- __func__, coarse_itg, gain, digitgain);
-
vts = ov2680_res[dev->fmt_idx].lines_per_frame;
/* group hold */
@@ -457,7 +451,6 @@ static int ov2680_v_flip(struct v4l2_subdev *sd, s32 value)
u16 val;
u8 index;
- dev_dbg(&client->dev, "@%s: value:%d\n", __func__, value);
ret = ov2680_read_reg(client, 1, OV2680_FLIP_REG, &val);
if (ret)
return ret;
@@ -490,8 +483,6 @@ static int ov2680_h_flip(struct v4l2_subdev *sd, s32 value)
u16 val;
u8 index;
- dev_dbg(&client->dev, "@%s: value:%d\n", __func__, value);
-
ret = ov2680_read_reg(client, 1, OV2680_MIRROR_REG, &val);
if (ret)
return ret;
@@ -524,13 +515,9 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl)
switch (ctrl->id) {
case V4L2_CID_VFLIP:
- dev_dbg(&client->dev, "%s: CID_VFLIP:%d.\n",
- __func__, ctrl->val);
ret = ov2680_v_flip(&dev->sd, ctrl->val);
break;
case V4L2_CID_HFLIP:
- dev_dbg(&client->dev, "%s: CID_HFLIP:%d.\n",
- __func__, ctrl->val);
ret = ov2680_h_flip(&dev->sd, ctrl->val);
break;
default:
@@ -704,8 +691,6 @@ static int power_ctrl(struct v4l2_subdev *sd, bool flag)
if (!dev || !dev->platform_data)
return -ENODEV;
- dev_dbg(&client->dev, "%s: %s", __func__, flag ? "on" : "off");
-
if (flag) {
ret |= dev->platform_data->v1p8_ctrl(sd, 1);
ret |= dev->platform_data->v2p8_ctrl(sd, 1);
@@ -1227,8 +1212,6 @@ static int ov2680_remove(struct i2c_client *client)
struct v4l2_subdev *sd = i2c_get_clientdata(client);
struct ov2680_device *dev = to_ov2680_sensor(sd);
- dev_dbg(&client->dev, "%s...\n", __func__);
-
dev->platform_data->csi_cfg(sd, 0);
v4l2_device_unregister_subdev(sd);
@@ -1297,13 +1280,11 @@ static int ov2680_probe(struct i2c_client *client)
dev->sd.ctrl_handler = &dev->ctrl_handler;
ret = media_entity_pads_init(&dev->sd.entity, 1, &dev->pad);
- if (ret) {
+ if (ret)
ov2680_remove(client);
- dev_dbg(&client->dev, "+++ remove ov2680\n");
- }
+
return ret;
out_free:
- dev_dbg(&client->dev, "+++ out free\n");
v4l2_device_unregister_subdev(&dev->sd);
kfree(dev);
return ret;
--
2.7.4
