diff options
| author |   Ricardo Ribalda <ribalda@chromium.org> | 2025-02-23 18:58:07 +0000 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2025-03-05 10:43:25 +0100 |
| commit | b810697e1c2ad8aeb58aada9c77b9fa7eac04f29 (patch) | |
| tree | 91491f305bae2cb43f1f9e381b19ea3151995ad9 /drivers/media/usb/uvc | |
| parent | media: pvrusb2: Remove g/s_ctrl callbacks (diff) | |
| download | wireguard-linux-b810697e1c2ad8aeb58aada9c77b9fa7eac04f29.tar.xz wireguard-linux-b810697e1c2ad8aeb58aada9c77b9fa7eac04f29.zip | |
media: uvcvideo: Remove vidioc_queryctrl
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>
Diffstat (limited to 'drivers/media/usb/uvc')
| -rw-r--r-- | drivers/media/usb/uvc/uvc_v4l2.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index d56f482723d3..39065db44e86 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -978,30 +978,6 @@ static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh, return uvc_query_v4l2_ctrl(chain, qec); } -static int uvc_ioctl_queryctrl(struct file *file, void *fh, - struct v4l2_queryctrl *qc) -{ - struct uvc_fh *handle = fh; - struct uvc_video_chain *chain = handle->chain; - struct v4l2_query_ext_ctrl qec = { qc->id }; - int ret; - - ret = uvc_query_v4l2_ctrl(chain, &qec); - if (ret) - return ret; - - qc->id = qec.id; - qc->type = qec.type; - strscpy(qc->name, qec.name, sizeof(qc->name)); - qc->minimum = qec.minimum; - qc->maximum = qec.maximum; - qc->step = qec.step; - qc->default_value = qec.default_value; - qc->flags = qec.flags; - - return 0; -} - static int uvc_ctrl_check_access(struct uvc_video_chain *chain, struct v4l2_ext_controls *ctrls, unsigned long ioctl) @@ -1494,7 +1470,6 @@ const struct v4l2_ioctl_ops uvc_ioctl_ops = { .vidioc_enum_input = uvc_ioctl_enum_input, .vidioc_g_input = uvc_ioctl_g_input, .vidioc_s_input = uvc_ioctl_s_input, - .vidioc_queryctrl = uvc_ioctl_queryctrl, .vidioc_query_ext_ctrl = uvc_ioctl_query_ext_ctrl, .vidioc_g_ext_ctrls = uvc_ioctl_g_ext_ctrls, .vidioc_s_ext_ctrls = uvc_ioctl_s_ext_ctrls, |