Skip to content

Commit 9959899

Browse files
author
Desnes Nunes
committed
media: uvcvideo: Remove vidioc_queryctrl
JIRA: https://issues.redhat.com/browse/RHEL-78934 commit b810697 Author: Ricardo Ribalda <ribalda@chromium.org> Date: Sun, 23 Feb 2025 18:58:07 +0000 It can be implemented by the v4l2 ioctl framework using vidioc_query_ext_ctrl. Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> [hverkuil: rebased] Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Desnes Nunes <desnesn@redhat.com>
1 parent 7d1718f commit 9959899

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

drivers/media/usb/uvc/uvc_v4l2.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -978,30 +978,6 @@ static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh,
978978
return uvc_query_v4l2_ctrl(chain, qec);
979979
}
980980

981-
static int uvc_ioctl_queryctrl(struct file *file, void *fh,
982-
struct v4l2_queryctrl *qc)
983-
{
984-
struct uvc_fh *handle = fh;
985-
struct uvc_video_chain *chain = handle->chain;
986-
struct v4l2_query_ext_ctrl qec = { qc->id };
987-
int ret;
988-
989-
ret = uvc_query_v4l2_ctrl(chain, &qec);
990-
if (ret)
991-
return ret;
992-
993-
qc->id = qec.id;
994-
qc->type = qec.type;
995-
strscpy(qc->name, qec.name, sizeof(qc->name));
996-
qc->minimum = qec.minimum;
997-
qc->maximum = qec.maximum;
998-
qc->step = qec.step;
999-
qc->default_value = qec.default_value;
1000-
qc->flags = qec.flags;
1001-
1002-
return 0;
1003-
}
1004-
1005981
static int uvc_ctrl_check_access(struct uvc_video_chain *chain,
1006982
struct v4l2_ext_controls *ctrls,
1007983
unsigned long ioctl)
@@ -1494,7 +1470,6 @@ const struct v4l2_ioctl_ops uvc_ioctl_ops = {
14941470
.vidioc_enum_input = uvc_ioctl_enum_input,
14951471
.vidioc_g_input = uvc_ioctl_g_input,
14961472
.vidioc_s_input = uvc_ioctl_s_input,
1497-
.vidioc_queryctrl = uvc_ioctl_queryctrl,
14981473
.vidioc_query_ext_ctrl = uvc_ioctl_query_ext_ctrl,
14991474
.vidioc_g_ext_ctrls = uvc_ioctl_g_ext_ctrls,
15001475
.vidioc_s_ext_ctrls = uvc_ioctl_s_ext_ctrls,

0 commit comments

Comments
 (0)