aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2011-09-08 12:16:56 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 16:28:55 -0400
commit0934d94a52423fac35922c2e29d72a43db7ddd48 (patch)
tree9f5b80aebc386019ca710029566a5fe509fbff19 /include/media
parent41efcd7a6862951fd13c0e950ef05b865d7488a8 (diff)
[media] soc_camera: remove the now obsolete struct soc_camera_ops
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> [g.liakhovetski@gmx.de: mt9m001 hunk moved to an earlier patch] Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/soc_camera.h18
1 files changed, 0 insertions, 18 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index d41b8bd74445..6398ff0f08ab 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -39,7 +39,6 @@ struct soc_camera_device {
39 unsigned char iface; /* Host number */ 39 unsigned char iface; /* Host number */
40 unsigned char devnum; /* Device number per host */ 40 unsigned char devnum; /* Device number per host */
41 struct soc_camera_sense *sense; /* See comment in struct definition */ 41 struct soc_camera_sense *sense; /* See comment in struct definition */
42 struct soc_camera_ops *ops;
43 struct video_device *vdev; 42 struct video_device *vdev;
44 struct v4l2_ctrl_handler ctrl_handler; 43 struct v4l2_ctrl_handler ctrl_handler;
45 const struct soc_camera_format_xlate *current_fmt; 44 const struct soc_camera_format_xlate *current_fmt;
@@ -192,11 +191,6 @@ struct soc_camera_format_xlate {
192 const struct soc_mbus_pixelfmt *host_fmt; 191 const struct soc_mbus_pixelfmt *host_fmt;
193}; 192};
194 193
195struct soc_camera_ops {
196 const struct v4l2_queryctrl *controls;
197 int num_controls;
198};
199
200#define SOCAM_SENSE_PCLK_CHANGED (1 << 0) 194#define SOCAM_SENSE_PCLK_CHANGED (1 << 0)
201 195
202/** 196/**
@@ -223,18 +217,6 @@ struct soc_camera_sense {
223 unsigned long pixel_clock; 217 unsigned long pixel_clock;
224}; 218};
225 219
226static inline struct v4l2_queryctrl const *soc_camera_find_qctrl(
227 struct soc_camera_ops *ops, int id)
228{
229 int i;
230
231 for (i = 0; i < ops->num_controls; i++)
232 if (ops->controls[i].id == id)
233 return &ops->controls[i];
234
235 return NULL;
236}
237
238#define SOCAM_DATAWIDTH(x) BIT((x) - 1) 220#define SOCAM_DATAWIDTH(x) BIT((x) - 1)
239#define SOCAM_DATAWIDTH_4 SOCAM_DATAWIDTH(4) 221#define SOCAM_DATAWIDTH_4 SOCAM_DATAWIDTH(4)
240#define SOCAM_DATAWIDTH_8 SOCAM_DATAWIDTH(8) 222#define SOCAM_DATAWIDTH_8 SOCAM_DATAWIDTH(8)