On 19/03/2021 18:08, Ricardo Ribalda wrote:
> If we do not implement these callback the framework will call the ext_ctrl
> callbaks instead, which are a superset of this functions.
callbaks -> callbacks
With that changed you can add my:
Reviewed-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Regards,
Hans
>
> Suggested-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
> Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> ---
> drivers/media/usb/uvc/uvc_v4l2.c | 56 --------------------------------
> 1 file changed, 56 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
> index 47b0e3224205..ac98869d5a05 100644
> --- a/drivers/media/usb/uvc/uvc_v4l2.c
> +++ b/drivers/media/usb/uvc/uvc_v4l2.c
> @@ -983,60 +983,6 @@ static int uvc_ioctl_query_ext_ctrl(struct file *file, void *fh,
> return 0;
> }
>
> -static int uvc_ioctl_g_ctrl(struct file *file, void *fh,
> - struct v4l2_control *ctrl)
> -{
> - struct uvc_fh *handle = fh;
> - struct uvc_video_chain *chain = handle->chain;
> - struct v4l2_ext_control xctrl;
> - int ret;
> -
> - memset(&xctrl, 0, sizeof(xctrl));
> - xctrl.id = ctrl->id;
> -
> - ret = uvc_ctrl_begin(chain);
> - if (ret < 0)
> - return ret;
> -
> - ret = uvc_ctrl_get(chain, &xctrl);
> - uvc_ctrl_rollback(handle);
> - if (ret < 0)
> - return ret;
> -
> - ctrl->value = xctrl.value;
> - return 0;
> -}
> -
> -static int uvc_ioctl_s_ctrl(struct file *file, void *fh,
> - struct v4l2_control *ctrl)
> -{
> - struct uvc_fh *handle = fh;
> - struct uvc_video_chain *chain = handle->chain;
> - struct v4l2_ext_control xctrl;
> - int ret;
> -
> - memset(&xctrl, 0, sizeof(xctrl));
> - xctrl.id = ctrl->id;
> - xctrl.value = ctrl->value;
> -
> - ret = uvc_ctrl_begin(chain);
> - if (ret < 0)
> - return ret;
> -
> - ret = uvc_ctrl_set(handle, &xctrl);
> - if (ret < 0) {
> - uvc_ctrl_rollback(handle);
> - return ret;
> - }
> -
> - ret = uvc_ctrl_commit(handle, &xctrl, 1);
> - if (ret < 0)
> - return ret;
> -
> - ctrl->value = xctrl.value;
> - return 0;
> -}
> -
> static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,
> struct v4l2_ext_controls *ctrls)
> {
> @@ -1522,8 +1468,6 @@ const struct v4l2_ioctl_ops uvc_ioctl_ops = {
> .vidioc_s_input = uvc_ioctl_s_input,
> .vidioc_queryctrl = uvc_ioctl_queryctrl,
> .vidioc_query_ext_ctrl = uvc_ioctl_query_ext_ctrl,
> - .vidioc_g_ctrl = uvc_ioctl_g_ctrl,
> - .vidioc_s_ctrl = uvc_ioctl_s_ctrl,
> .vidioc_g_ext_ctrls = uvc_ioctl_g_ext_ctrls,
> .vidioc_s_ext_ctrls = uvc_ioctl_s_ext_ctrls,
> .vidioc_try_ext_ctrls = uvc_ioctl_try_ext_ctrls,
>
