diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2011-07-28 14:42:27 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-11-03 18:28:07 -0200 |
| commit | 3d780ad712d3de61da5ba0ce206a261646dc68dc (patch) | |
| tree | 770f4139b9a9657735d77c5048f6ff706892beda /drivers/media/video/ov9740.c | |
| parent | 88e816a2d5d53b791d0ecc314bf2369d826be1d2 (diff) | |
| download | talos-op-linux-3d780ad712d3de61da5ba0ce206a261646dc68dc.tar.gz talos-op-linux-3d780ad712d3de61da5ba0ce206a261646dc68dc.zip | |
[media] V4L: ov9740: 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/video/ov9740.c')
| -rw-r--r-- | drivers/media/video/ov9740.c | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/drivers/media/video/ov9740.c b/drivers/media/video/ov9740.c index 67b7020c933e..5920f600990f 100644 --- a/drivers/media/video/ov9740.c +++ b/drivers/media/video/ov9740.c @@ -562,25 +562,6 @@ static int ov9740_s_stream(struct v4l2_subdev *sd, int enable) return ret; } -/* Alter bus settings on camera side */ -static int ov9740_set_bus_param(struct soc_camera_device *icd, - unsigned long flags) -{ - return 0; -} - -/* Request bus settings on camera side */ -static unsigned long ov9740_query_bus_param(struct soc_camera_device *icd) -{ - 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 | SOCAM_DATAWIDTH_8; - - return soc_camera_apply_sensor_flags(icl, flags); -} - /* select nearest higher resolution for capture */ static void ov9740_res_roundup(u32 *width, u32 *height) { @@ -945,12 +926,11 @@ err: } static struct soc_camera_ops ov9740_ops = { - .set_bus_param = ov9740_set_bus_param, - .query_bus_param = ov9740_query_bus_param, .controls = ov9740_controls, .num_controls = ARRAY_SIZE(ov9740_controls), }; +/* Request bus settings on camera side */ static int ov9740_g_mbus_config(struct v4l2_subdev *sd, struct v4l2_mbus_config *cfg) { |
