| Message ID | 20241210-queryctrl-v2-4-c0a33d69f416@chromium.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: Remove vidioc_g/s_ctrl and vidioc_queryctrl callbacks | expand |
On Tue, Dec 10, 2024 at 09:28:48AM +0000, Ricardo Ribalda wrote: > It can be implemented by the v4l2 ioctl framework using > vidioc_query_ext_ctrl. > > Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/media/usb/uvc/uvc_v4l2.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c > index 97c5407f6603..39f0ddb6d01c 100644 > --- a/drivers/media/usb/uvc/uvc_v4l2.c > +++ b/drivers/media/usb/uvc/uvc_v4l2.c > @@ -1014,15 +1014,6 @@ static int uvc_ioctl_s_input(struct file *file, void *fh, unsigned int input) > return ret; > } > > -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; > - > - return uvc_query_v4l2_ctrl(chain, qc); > -} > - > static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh, > struct v4l2_query_ext_ctrl *qec) > { > @@ -1563,7 +1554,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,
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 97c5407f6603..39f0ddb6d01c 100644 --- a/drivers/media/usb/uvc/uvc_v4l2.c +++ b/drivers/media/usb/uvc/uvc_v4l2.c @@ -1014,15 +1014,6 @@ static int uvc_ioctl_s_input(struct file *file, void *fh, unsigned int input) return ret; } -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; - - return uvc_query_v4l2_ctrl(chain, qc); -} - static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh, struct v4l2_query_ext_ctrl *qec) { @@ -1563,7 +1554,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,
It can be implemented by the v4l2 ioctl framework using vidioc_query_ext_ctrl. Signed-off-by: Ricardo Ribalda <ribalda@chromium.org> --- drivers/media/usb/uvc/uvc_v4l2.c | 10 ---------- 1 file changed, 10 deletions(-)