renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-19 18:53:52 +08:00
Code

V4L/DVB (12521): soc-camera: use .s_std() from struct v4l2_subdev_core_ops

Browse Source 
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>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2009-08-25 11:46:51 -03:00 committed by Mauro Carvalho Chehab
parent cca0e54905
commit a12222a73e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/video/soc_camera.c
View File

@ -152,12 +152,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;
struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent);
if (icd->ops->set_std)
ret = icd->ops->set_std(icd, a);
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,

1
include/media/soc_camera.h
View File

@ -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;