Skip to content

Commit

Permalink
[media] V4L: ov772x: remove superfluous soc-camera client operations
Browse files Browse the repository at this point in the history
Now that all soc-camera hosts have been ported to use V4L2 subdevice
mediabus-config operations and soc-camera client bus-parameter operations
have been made optional, they can be removed.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Nov 3, 2011
1 parent cb62637 commit 3e1b6b7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 26 deletions.
25 changes: 0 additions & 25 deletions drivers/media/video/ov772x.c
Original file line number Diff line number Diff line change
Expand Up @@ -621,29 +621,6 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable)
return 0;
}

static int ov772x_set_bus_param(struct soc_camera_device *icd,
unsigned long flags)
{
return 0;
}

static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
{
struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
struct ov772x_priv *priv = i2c_get_clientdata(client);
struct soc_camera_link *icl = to_soc_camera_link(icd);
unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
SOCAM_DATA_ACTIVE_HIGH;

if (priv->info->flags & OV772X_FLAG_8BIT)
flags |= SOCAM_DATAWIDTH_8;
else
flags |= SOCAM_DATAWIDTH_10;

return soc_camera_apply_sensor_flags(icl, flags);
}

static int ov772x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
{
struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
Expand Down Expand Up @@ -1070,8 +1047,6 @@ static int ov772x_video_probe(struct soc_camera_device *icd,
}

static struct soc_camera_ops ov772x_ops = {
.set_bus_param = ov772x_set_bus_param,
.query_bus_param = ov772x_query_bus_param,
.controls = ov772x_controls,
.num_controls = ARRAY_SIZE(ov772x_controls),
};
Expand Down
1 change: 0 additions & 1 deletion include/media/ov772x.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
/* for flags */
#define OV772X_FLAG_VFLIP (1 << 0) /* Vertical flip image */
#define OV772X_FLAG_HFLIP (1 << 1) /* Horizontal flip image */
#define OV772X_FLAG_8BIT (1 << 2) /* default 10 bit */

/*
* for Edge ctrl
Expand Down

0 comments on commit 3e1b6b7

Please sign in to comment.