diff options
author | Guennadi Liakhovetski <lyakh@axis700.grange> | 2008-12-01 07:44:53 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:38:21 -0500 |
commit | a2c8c68cca3dbb0c87f5034ab8ea29350174ec4a (patch) | |
tree | ec5aa7c75e6bfeaec6fc365d47941dbb18cda098 /include/media | |
parent | b3d7b2ad9cd7612354d921ba948ab6514699519c (diff) |
V4L/DVB (9785): 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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/soc_camera.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 9231e2d908f2..ee0e6b4bed33 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
@@ -73,7 +73,6 @@ struct soc_camera_host_ops { | |||
73 | struct soc_camera_device *); | 73 | struct soc_camera_device *); |
74 | int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); | 74 | int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); |
75 | int (*querycap)(struct soc_camera_host *, struct v4l2_capability *); | 75 | int (*querycap)(struct soc_camera_host *, struct v4l2_capability *); |
76 | int (*try_bus_param)(struct soc_camera_device *, __u32); | ||
77 | int (*set_bus_param)(struct soc_camera_device *, __u32); | 76 | int (*set_bus_param)(struct soc_camera_device *, __u32); |
78 | unsigned int (*poll)(struct file *, poll_table *); | 77 | unsigned int (*poll)(struct file *, poll_table *); |
79 | }; | 78 | }; |