Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12222a7 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

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



Remove .set_std() method from struct soc_camera_ops, use .s_std() from
struct v4l2_subdev_core_ops instead.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cca0e549

drivers/media/video/soc_camera.c

+2 −5
Original line number Diff line number Diff line
@@ -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;



	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,

include/media/soc_camera.h

+0 −1
Original line number Diff line number Diff line
@@ -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;