Commit e65d147b authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: cx231xx: Remove vidioc_s_ctrl callback 



The driver has been converted to the control framework in the past:
commit 88b6ffed ("[media] cx231xx-417: convert to the control
framework").

This function is never called, the core will only use the control
framework instead.

Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Tested-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 70307f28

drivers/media/usb/cx231xx/cx231xx-417.c

+0 −15
Original line number Diff line number Diff line
@@ -1538,20 +1538,6 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id) 
	return 0;

}



static int vidioc_s_ctrl(struct file *file, void *priv,

				struct v4l2_control *ctl)

{

	struct cx231xx *dev = video_drvdata(file);

	struct v4l2_subdev *sd;



	dprintk(3, "enter vidioc_s_ctrl()\n");

	/* Update the A/V core */

	v4l2_device_for_each_subdev(sd, &dev->v4l2_dev)

		v4l2_s_ctrl(NULL, sd->ctrl_handler, ctl);

	dprintk(3, "exit vidioc_s_ctrl()\n");

	return 0;

}



static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,

					struct v4l2_fmtdesc *f)

{
@@ -1627,7 +1613,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = { 
	.vidioc_enum_input	 = cx231xx_enum_input,

	.vidioc_g_input		 = cx231xx_g_input,

	.vidioc_s_input		 = cx231xx_s_input,

	.vidioc_s_ctrl		 = vidioc_s_ctrl,

	.vidioc_g_pixelaspect	 = vidioc_g_pixelaspect,

	.vidioc_g_selection	 = vidioc_g_selection,

	.vidioc_querycap	 = cx231xx_querycap,