Skip to content

Commit e65d147

Browse files
ribaldamchehab
authored andcommitted
media: cx231xx: Remove vidioc_s_ctrl callback
The driver has been converted to the control framework in the past: commit 88b6ffe ("[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: Ricardo Ribalda <ribalda@chromium.org> Tested-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
1 parent 70307f2 commit e65d147

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1538,20 +1538,6 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
15381538
return 0;
15391539
}
15401540

1541-
static int vidioc_s_ctrl(struct file *file, void *priv,
1542-
struct v4l2_control *ctl)
1543-
{
1544-
struct cx231xx *dev = video_drvdata(file);
1545-
struct v4l2_subdev *sd;
1546-
1547-
dprintk(3, "enter vidioc_s_ctrl()\n");
1548-
/* Update the A/V core */
1549-
v4l2_device_for_each_subdev(sd, &dev->v4l2_dev)
1550-
v4l2_s_ctrl(NULL, sd->ctrl_handler, ctl);
1551-
dprintk(3, "exit vidioc_s_ctrl()\n");
1552-
return 0;
1553-
}
1554-
15551541
static int vidioc_enum_fmt_vid_cap(struct file *file, void *priv,
15561542
struct v4l2_fmtdesc *f)
15571543
{
@@ -1627,7 +1613,6 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
16271613
.vidioc_enum_input = cx231xx_enum_input,
16281614
.vidioc_g_input = cx231xx_g_input,
16291615
.vidioc_s_input = cx231xx_s_input,
1630-
.vidioc_s_ctrl = vidioc_s_ctrl,
16311616
.vidioc_g_pixelaspect = vidioc_g_pixelaspect,
16321617
.vidioc_g_selection = vidioc_g_selection,
16331618
.vidioc_querycap = cx231xx_querycap,

0 commit comments

Comments
 (0)