Commit 0c6bcbdf authored by Ricardo Ribalda's avatar Ricardo Ribalda Committed by Mauro Carvalho Chehab
Browse files

media: uvcvideo: Remove s_ctrl and g_ctrl 



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: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarRicardo Ribalda <ribalda@chromium.org>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent c87ed935

drivers/media/usb/uvc/uvc_v4l2.c

+0 −56
Original line number Diff line number Diff line
@@ -995,60 +995,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)

{
@@ -1534,8 +1480,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,