diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:54 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:54 +0200 |
| commit | a94ff67f3f3091badb6034566504ad58206989ef (patch) | |
| tree | 3367dc3deb2810262dd3aa9811f89b8884a89bbd /linux/include/media | |
| parent | 6bd7b0281dd65988d5cf613bc99541ef4a8f16cf (diff) | |
| download | mediapointer-dvb-s2-a94ff67f3f3091badb6034566504ad58206989ef.tar.gz mediapointer-dvb-s2-a94ff67f3f3091badb6034566504ad58206989ef.tar.bz2 | |
soc-camera: switch to s_crop v4l2-subdev video operation
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
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>
Priority: low
---
drivers/media/video/mt9m001.c | 23 +++---
drivers/media/video/mt9m111.c | 9 +-
drivers/media/video/mt9t031.c | 9 +-
drivers/media/video/mt9v022.c | 23 +++---
drivers/media/video/mx1_camera.c | 8 ++-
drivers/media/video/mx3_camera.c | 7 +-
drivers/media/video/ov772x.c | 19 -----
drivers/media/video/pxa_camera.c | 7 +-
drivers/media/video/sh_mobile_ceu_camera.c | 110 ++++++++++++++-------------
drivers/media/video/soc_camera.c | 4 +-
drivers/media/video/soc_camera_platform.c | 28 ++++----
drivers/media/video/tw9910.c | 31 ++++----
include/media/soc_camera.h | 3 +-
13 files changed, 142 insertions(+), 139 deletions(-)
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/soc_camera.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 7c44d4016..0bad8f1d7 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -76,7 +76,7 @@ struct soc_camera_host_ops { int (*get_formats)(struct soc_camera_device *, int, struct soc_camera_format_xlate *); void (*put_formats)(struct soc_camera_device *); - int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *); + int (*set_crop)(struct soc_camera_device *, struct v4l2_crop *); int (*set_fmt)(struct soc_camera_device *, struct v4l2_format *); int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *); void (*init_videobuf)(struct videobuf_queue *, @@ -185,7 +185,6 @@ struct soc_camera_ops { int (*resume)(struct soc_camera_device *); int (*init)(struct soc_camera_device *); int (*release)(struct soc_camera_device *); - int (*set_crop)(struct soc_camera_device *, struct v4l2_rect *); unsigned long (*query_bus_param)(struct soc_camera_device *); int (*set_bus_param)(struct soc_camera_device *, unsigned long); int (*get_chip_id)(struct soc_camera_device *, |