diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:51 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-08-25 16:46:51 +0200 |
| commit | 4cba5b9dc9691179938d5481bda3c97e376e0964 (patch) | |
| tree | 8ea48daca2a5eeb0350b3963b17de942c2fdec6f | |
| parent | 476b4e44d0836e75896fd12b0d5f33fdc706bee9 (diff) | |
| download | mediapointer-dvb-s2-4cba5b9dc9691179938d5481bda3c97e376e0964.tar.gz mediapointer-dvb-s2-4cba5b9dc9691179938d5481bda3c97e376e0964.tar.bz2 | |
soc-camera: use .s_std() from struct v4l2_subdev_core_ops
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Remove .set_std() method from struct soc_camera_ops, use .s_std() from
struct v4l2_subdev_core_ops instead.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/soc_camera.c | 7 ++-----
include/media/soc_camera.h | 1 -
2 files changed, 2 insertions(+), 6 deletions(-)
| -rw-r--r-- | linux/drivers/media/video/soc_camera.c | 7 | ||||
| -rw-r--r-- | linux/include/media/soc_camera.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/linux/drivers/media/video/soc_camera.c b/linux/drivers/media/video/soc_camera.c index dd348a0b3..104496141 100644 --- a/linux/drivers/media/video/soc_camera.c +++ b/linux/drivers/media/video/soc_camera.c @@ -153,12 +153,9 @@ static int soc_camera_s_std(struct file *file, void *priv, v4l2_std_id *a) { struct soc_camera_file *icf = file->private_data; struct soc_camera_device *icd = icf->icd; - int ret = 0; - - if (icd->ops->set_std) - ret = icd->ops->set_std(icd, a); + struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); - return ret; + return v4l2_device_call_until_err(&ici->v4l2_dev, (__u32)icd, core, s_std, *a); } static int soc_camera_reqbufs(struct file *file, void *priv, diff --git a/linux/include/media/soc_camera.h b/linux/include/media/soc_camera.h index 2b7a8c663..7c44d4016 100644 --- a/linux/include/media/soc_camera.h +++ b/linux/include/media/soc_camera.h @@ -190,7 +190,6 @@ struct soc_camera_ops { int (*set_bus_param)(struct soc_camera_device *, unsigned long); int (*get_chip_id)(struct soc_camera_device *, struct v4l2_dbg_chip_ident *); - int (*set_std)(struct soc_camera_device *, v4l2_std_id *); int (*enum_input)(struct soc_camera_device *, struct v4l2_input *); const struct v4l2_queryctrl *controls; int num_controls; |