aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-28 18:02:34 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:05 -0400
commit3e1b6b72b9a33a12efbe29f046335098c53dbb58 (patch)
treeb10ee70dc7e265b9b1fdc5bb12c3685f63b993f4 /drivers/media
parentcb626371f872070e7fb4ee9caa7bc873c3ceec55 (diff)
[media] V4L: ov772x: remove superfluous soc-camera client operations
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/ov772x.c25
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/media/video/ov772x.c b/drivers/media/video/ov772x.c
index b70ffba58494..f77e8995fe40 100644
--- a/drivers/media/video/ov772x.c
+++ b/drivers/media/video/ov772x.c
@@ -621,29 +621,6 @@ static int ov772x_s_stream(struct v4l2_subdev *sd, int enable)
621 return 0; 621 return 0;
622} 622}
623 623
624static int ov772x_set_bus_param(struct soc_camera_device *icd,
625 unsigned long flags)
626{
627 return 0;
628}
629
630static unsigned long ov772x_query_bus_param(struct soc_camera_device *icd)
631{
632 struct i2c_client *client = to_i2c_client(to_soc_camera_control(icd));
633 struct ov772x_priv *priv = i2c_get_clientdata(client);
634 struct soc_camera_link *icl = to_soc_camera_link(icd);
635 unsigned long flags = SOCAM_PCLK_SAMPLE_RISING | SOCAM_MASTER |
636 SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_HIGH |
637 SOCAM_DATA_ACTIVE_HIGH;
638
639 if (priv->info->flags & OV772X_FLAG_8BIT)
640 flags |= SOCAM_DATAWIDTH_8;
641 else
642 flags |= SOCAM_DATAWIDTH_10;
643
644 return soc_camera_apply_sensor_flags(icl, flags);
645}
646
647static int ov772x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl) 624static int ov772x_g_ctrl(struct v4l2_subdev *sd, struct v4l2_control *ctrl)
648{ 625{
649 struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev); 626 struct ov772x_priv *priv = container_of(sd, struct ov772x_priv, subdev);
@@ -1070,8 +1047,6 @@ static int ov772x_video_probe(struct soc_camera_device *icd,
1070} 1047}
1071 1048
1072static struct soc_camera_ops ov772x_ops = { 1049static struct soc_camera_ops ov772x_ops = {
1073 .set_bus_param = ov772x_set_bus_param,
1074 .query_bus_param = ov772x_query_bus_param,
1075 .controls = ov772x_controls, 1050 .controls = ov772x_controls,
1076 .num_controls = ARRAY_SIZE(ov772x_controls), 1051 .num_controls = ARRAY_SIZE(ov772x_controls),
1077}; 1052};