media: uvcvideo: Remove s_ctrl and g_ctrl

[ Upstream commit 0c6bcbdfefa83b8a1e9659b3c127758dce0fe7ac ]

If we do not implement these callbacks the framework will call the
ext_ctrl callbaks instead, which are a superset of this functions.

Suggested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: 9f582f0418ed ("media: uvcvideo: Check for INACTIVE in uvc_ctrl_is_accessible()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index d2e633f6ec671eaa6b11b636e095bdce8a221411..6955ed080d7dc5348d998b08761777de528f0a66 100644 (file)
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1000,60 +1000,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)
 {
@@ -1539,8 +1485,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,