diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 10:46:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-09-18 23:19:06 -0400 |
commit | 08590b9613f7f624fe3a052586eea2dbb3584b38 (patch) | |
tree | a893d250a4edf84e93794be59e2b1d859314c972 /include/media | |
parent | 961801bbb3448a86f0cc93747cecbfae686d81d1 (diff) |
V4L/DVB (12529): soc-camera: switch to s_crop v4l2-subdev video operation
Remove set_crop soc-camera device method and switch to s_crop from v4l2-subdev
video operations. Also extend non-i2c drivers to also hold a pointer to their
v4l2-subdev instance in control device driver-data, i.e., in
dev_get_drvdata((struct device *)to_soc_camera_control(icd))
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.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 7c44d4016561..0bad8f1d7e8d 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
@@ -76,7 +76,7 @@ struct soc_camera_host_ops { | |||
76 | int (*get_formats)(struct soc_camera_device *, int, | 76 | int (*get_formats)(struct soc_camera_device *, int, |
77 | struct soc_camera_format_xlate *); | 77 | struct soc_camera_format_xlate *); |
78 | void (*put_formats)(struct soc_camera_device *); | 78 | void (*put_formats)(struct soc_camera_device *); |
79 | int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *); | 79 | int (*set_crop)(struct soc_camera_device *, struct v4l2_crop *); |
80 | int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *); | 80 | int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *); |
81 | int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *); | 81 | int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *); |
82 | void (*init_videobuf)(struct videobuf_queue *, | 82 | void (*init_videobuf)(struct videobuf_queue *, |
@@ -185,7 +185,6 @@ struct soc_camera_ops { | |||
185 | int (*resume)(struct soc_camera_device *); | 185 | int (*resume)(struct soc_camera_device *); |
186 | int (*init)(struct soc_camera_device *); | 186 | int (*init)(struct soc_camera_device *); |
187 | int (*release)(struct soc_camera_device *); | 187 | int (*release)(struct soc_camera_device *); |
188 | int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *); | ||
189 | unsigned long (*query_bus_param)(struct soc_camera_device *); | 188 | unsigned long (*query_bus_param)(struct soc_camera_device *); |
190 | int (*set_bus_param)(struct soc_camera_device *, unsigned long); | 189 | int (*set_bus_param)(struct soc_camera_device *, unsigned long); |
191 | int (*get_chip_id)(struct soc_camera_device *, | 190 | int (*get_chip_id)(struct soc_camera_device *, |