Commit e7d59935 authored by Stephen Brennan's avatar Stephen Brennan Committed by Mauro Carvalho Chehab

media: staging: media: atomisp: remove trailing whitespace

Signed-off-by: default avatarStephen Brennan <stephen@brennan.io>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a827c1a9
...@@ -89,7 +89,7 @@ static int ov2680_read_reg(struct i2c_client *client, ...@@ -89,7 +89,7 @@ static int ov2680_read_reg(struct i2c_client *client,
"read from offset 0x%x error %d", reg, err); "read from offset 0x%x error %d", reg, err);
return err; return err;
} }
*val = 0; *val = 0;
/* high byte comes first */ /* high byte comes first */
if (data_length == OV2680_8BIT) if (data_length == OV2680_8BIT)
...@@ -285,7 +285,6 @@ static int ov2680_g_fnumber(struct v4l2_subdev *sd, s32 *val) ...@@ -285,7 +285,6 @@ static int ov2680_g_fnumber(struct v4l2_subdev *sd, s32 *val)
static int ov2680_g_fnumber_range(struct v4l2_subdev *sd, s32 *val) static int ov2680_g_fnumber_range(struct v4l2_subdev *sd, s32 *val)
{ {
*val = (OV2680_F_NUMBER_DEFAULT_NUM << 24) | *val = (OV2680_F_NUMBER_DEFAULT_NUM << 24) |
(OV2680_F_NUMBER_DEM << 16) | (OV2680_F_NUMBER_DEM << 16) |
(OV2680_F_NUMBER_DEFAULT_NUM << 8) | OV2680_F_NUMBER_DEM; (OV2680_F_NUMBER_DEFAULT_NUM << 8) | OV2680_F_NUMBER_DEM;
...@@ -306,7 +305,7 @@ static int ov2680_g_bin_factor_y(struct v4l2_subdev *sd, s32 *val) ...@@ -306,7 +305,7 @@ static int ov2680_g_bin_factor_y(struct v4l2_subdev *sd, s32 *val)
{ {
struct ov2680_device *dev = to_ov2680_sensor(sd); struct ov2680_device *dev = to_ov2680_sensor(sd);
struct i2c_client *client = v4l2_get_subdevdata(sd); struct i2c_client *client = v4l2_get_subdevdata(sd);
*val = ov2680_res[dev->fmt_idx].bin_factor_y; *val = ov2680_res[dev->fmt_idx].bin_factor_y;
dev_dbg(&client->dev, "++++ov2680_g_bin_factor_y\n"); dev_dbg(&client->dev, "++++ov2680_g_bin_factor_y\n");
return 0; return 0;
...@@ -399,7 +398,7 @@ static long __ov2680_set_exposure(struct v4l2_subdev *sd, int coarse_itg, ...@@ -399,7 +398,7 @@ static long __ov2680_set_exposure(struct v4l2_subdev *sd, int coarse_itg,
struct ov2680_device *dev = to_ov2680_sensor(sd); struct ov2680_device *dev = to_ov2680_sensor(sd);
u16 vts,hts; u16 vts,hts;
int ret,exp_val; int ret,exp_val;
dev_dbg(&client->dev, "+++++++__ov2680_set_exposure coarse_itg %d, gain %d, digitgain %d++\n",coarse_itg, gain, digitgain); dev_dbg(&client->dev, "+++++++__ov2680_set_exposure coarse_itg %d, gain %d, digitgain %d++\n",coarse_itg, gain, digitgain);
hts = ov2680_res[dev->fmt_idx].pixels_per_line; hts = ov2680_res[dev->fmt_idx].pixels_per_line;
...@@ -542,7 +541,7 @@ static long ov2680_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) ...@@ -542,7 +541,7 @@ static long ov2680_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
switch (cmd) { switch (cmd) {
case ATOMISP_IOC_S_EXPOSURE: case ATOMISP_IOC_S_EXPOSURE:
return ov2680_s_exposure(sd, arg); return ov2680_s_exposure(sd, arg);
default: default:
return -EINVAL; return -EINVAL;
} }
...@@ -983,7 +982,7 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on) ...@@ -983,7 +982,7 @@ static int ov2680_s_power(struct v4l2_subdev *sd, int on)
if (on == 0){ if (on == 0){
ret = power_down(sd); ret = power_down(sd);
} else { } else {
ret = power_up(sd); ret = power_up(sd);
if (!ret) if (!ret)
return ov2680_init(sd); return ov2680_init(sd);
} }
...@@ -1207,7 +1206,7 @@ static int ov2680_s_stream(struct v4l2_subdev *sd, int enable) ...@@ -1207,7 +1206,7 @@ static int ov2680_s_stream(struct v4l2_subdev *sd, int enable)
dev_dbg(&client->dev, "ov2680_s_stream one \n"); dev_dbg(&client->dev, "ov2680_s_stream one \n");
else else
dev_dbg(&client->dev, "ov2680_s_stream off \n"); dev_dbg(&client->dev, "ov2680_s_stream off \n");
ret = ov2680_write_reg(client, OV2680_8BIT, OV2680_SW_STREAM, ret = ov2680_write_reg(client, OV2680_8BIT, OV2680_SW_STREAM,
enable ? OV2680_START_STREAMING : enable ? OV2680_START_STREAMING :
OV2680_STOP_STREAMING); OV2680_STOP_STREAMING);
...@@ -1267,7 +1266,7 @@ static int ov2680_s_config(struct v4l2_subdev *sd, ...@@ -1267,7 +1266,7 @@ static int ov2680_s_config(struct v4l2_subdev *sd,
dev_err(&client->dev, "ov2680_detect err s_config.\n"); dev_err(&client->dev, "ov2680_detect err s_config.\n");
goto fail_csi_cfg; goto fail_csi_cfg;
} }
/* turn off sensor, after probed */ /* turn off sensor, after probed */
ret = power_down(sd); ret = power_down(sd);
if (ret) { if (ret) {
...@@ -1385,7 +1384,7 @@ static int ov2680_enum_frame_size(struct v4l2_subdev *sd, ...@@ -1385,7 +1384,7 @@ static int ov2680_enum_frame_size(struct v4l2_subdev *sd,
static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames) static int ov2680_g_skip_frames(struct v4l2_subdev *sd, u32 *frames)
{ {
struct ov2680_device *dev = to_ov2680_sensor(sd); struct ov2680_device *dev = to_ov2680_sensor(sd);
mutex_lock(&dev->input_lock); mutex_lock(&dev->input_lock);
*frames = ov2680_res[dev->fmt_idx].skip_frames; *frames = ov2680_res[dev->fmt_idx].skip_frames;
mutex_unlock(&dev->input_lock); mutex_unlock(&dev->input_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment