diff options
| author | Guennadi Liakhovetski <lyakh@axis700.grange> | 2008-12-01 13:44:53 +0100 |
|---|---|---|
| committer | Guennadi Liakhovetski <lyakh@axis700.grange> | 2008-12-01 13:44:53 +0100 |
| commit | 0b36e297630eb11d129e39d264704119ef3e5bb6 (patch) | |
| tree | 4a50a9b977037cab6511aa12d2945ed63c4989e4 /linux/include/media/soc_camera.h | |
| parent | 64934a93ee0c4f6edf946a0c044ee7a0ec871a0c (diff) | |
| download | mediapointer-dvb-s2-0b36e297630eb11d129e39d264704119ef3e5bb6.tar.gz mediapointer-dvb-s2-0b36e297630eb11d129e39d264704119ef3e5bb6.tar.bz2 | |
soc-camera: merge .try_bus_param() into .try_fmt_cap()
.try_bus_param() method from struct soc_camera_host_ops is only called at one
location immediately before .try_fmt_cap(), there is no value in keeping these
two methods separate, merge them.
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
---
drivers/media/video/pxa_camera.c | 6 +++++-
drivers/media/video/sh_mobile_ceu_camera.c | 6 +++++-
drivers/media/video/soc_camera.c | 5 -----
include/media/soc_camera.h | 1 -
4 files changed, 10 insertions(+), 8 deletions(-)
Diffstat (limited to 'linux/include/media/soc_camera.h')
| -rw-r--r-- | linux/include/media/soc_camera.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 9231e2d90..ee0e6b4be 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -73,7 +73,6 @@ struct soc_camera_host_ops { struct soc_camera_device *); int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); int (*querycap)(struct soc_camera_host *, struct v4l2_capability *); - int (*try_bus_param)(struct soc_camera_device *, __u32); int (*set_bus_param)(struct soc_camera_device *, __u32); unsigned int (*poll)(struct file *, poll_table *); }; |