From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
tfiga@chromium.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v7 15/17] media: uvcvideo: Refactor __uvc_ctrl_commit
Date: Thu, 18 Mar 2021 21:29:26 +0100 [thread overview]
Message-ID: <20210318202928.166955-16-ribalda@chromium.org> (raw)
In-Reply-To: <20210318202928.166955-1-ribalda@chromium.org>
Take a v4l2_ext_controls instead of an array of controls, this way we
can access the error_idx in future changes.
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
drivers/media/usb/uvc/uvc_ctrl.c | 5 ++---
drivers/media/usb/uvc/uvc_v4l2.c | 8 ++++++--
drivers/media/usb/uvc/uvcvideo.h | 10 ++++------
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index 1ec8333811bc..fb8155ca0c0d 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1664,8 +1664,7 @@ static int uvc_ctrl_commit_entity(struct uvc_device *dev,
}
int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
- const struct v4l2_ext_control *xctrls,
- unsigned int xctrls_count)
+ struct v4l2_ext_controls *ctrls)
{
struct uvc_video_chain *chain = handle->chain;
struct uvc_entity *entity;
@@ -1679,7 +1678,7 @@ int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
}
if (!rollback)
- uvc_ctrl_send_events(handle, xctrls, xctrls_count);
+ uvc_ctrl_send_events(handle, ctrls->controls, ctrls->count);
done:
mutex_unlock(&chain->ctrl_mutex);
return ret;
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index ddebdeb5a81b..ea2c41b04664 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -1025,6 +1025,10 @@ static int uvc_ioctl_s_ctrl(struct file *file, void *fh,
struct uvc_fh *handle = fh;
struct uvc_video_chain *chain = handle->chain;
struct v4l2_ext_control xctrl;
+ struct v4l2_ext_controls ctrls = {
+ .count = 1,
+ .controls = &xctrl,
+ };
int ret;
ret = uvc_ctrl_is_accessible(chain, ctrl->id, VIDIOC_S_CTRL);
@@ -1045,7 +1049,7 @@ static int uvc_ioctl_s_ctrl(struct file *file, void *fh,
return ret;
}
- ret = uvc_ctrl_commit(handle, &xctrl, 1);
+ ret = uvc_ctrl_commit(handle, &ctrls);
if (ret < 0)
return ret;
@@ -1149,7 +1153,7 @@ static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle,
ctrls->error_idx = 0;
if (ioctl == VIDIOC_S_EXT_CTRLS)
- return uvc_ctrl_commit(handle, ctrls->controls, ctrls->count);
+ return uvc_ctrl_commit(handle, ctrls);
else
return uvc_ctrl_rollback(handle);
}
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index a93aeedb5499..4e7b6da3c6d2 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -887,17 +887,15 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain,
int uvc_ctrl_begin(struct uvc_video_chain *chain);
int __uvc_ctrl_commit(struct uvc_fh *handle, int rollback,
- const struct v4l2_ext_control *xctrls,
- unsigned int xctrls_count);
+ struct v4l2_ext_controls *ctrls);
static inline int uvc_ctrl_commit(struct uvc_fh *handle,
- const struct v4l2_ext_control *xctrls,
- unsigned int xctrls_count)
+ struct v4l2_ext_controls *ctrls)
{
- return __uvc_ctrl_commit(handle, 0, xctrls, xctrls_count);
+ return __uvc_ctrl_commit(handle, 0, ctrls);
}
static inline int uvc_ctrl_rollback(struct uvc_fh *handle)
{
- return __uvc_ctrl_commit(handle, 1, NULL, 0);
+ return __uvc_ctrl_commit(handle, 1, NULL);
}
int uvc_ctrl_get(struct uvc_video_chain *chain, struct v4l2_ext_control *xctrl);
--
2.31.0.rc2.261.g7f71774620-goog
next prev parent reply other threads:[~2021-03-18 20:30 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 20:29 [PATCH v7 00/17] uvcvideo: Fix v4l2-compliance errors Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 01/17] media: v4l2-ioctl: Fix check_ext_ctrls Ricardo Ribalda
2021-03-19 9:02 ` Hans Verkuil
2021-03-18 20:29 ` [PATCH v7 02/17] media: pvrusb2: Do not check for V4L2_CTRL_WHICH_DEF_VAL Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 03/17] media: uvcvideo: " Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 04/17] media: uvcvideo: Set capability in s_param Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 05/17] media: uvcvideo: Return -EIO for control errors Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 06/17] media: uvcvideo: refactor __uvc_ctrl_add_mapping Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 07/17] media: uvcvideo: Add support for V4L2_CTRL_TYPE_CTRL_CLASS Ricardo Ribalda
2021-03-19 7:46 ` Hans Verkuil
2021-03-18 20:29 ` [PATCH v7 08/17] media: uvcvideo: Use dev->name for querycap() Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 09/17] media: uvcvideo: Set unique vdev name based in type Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 10/17] media: uvcvideo: Increase the size of UVC_METADATA_BUF_SIZE Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 11/17] media: uvcvideo: Use control names from framework Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 12/17] media: uvcvideo: Check controls flags before accessing them Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 13/17] media: uvcvideo: Return -EACCES to inactive controls Ricardo Ribalda
2021-03-19 9:10 ` Hans Verkuil
2021-03-19 9:49 ` Ricardo Ribalda
2021-03-19 13:40 ` Hans Verkuil
2021-03-18 20:29 ` [PATCH v7 14/17] media: docs: Document the behaviour of uvcdriver Ricardo Ribalda
2021-03-18 20:29 ` Ricardo Ribalda [this message]
2021-03-19 8:33 ` [PATCH v7 15/17] media: uvcvideo: Refactor __uvc_ctrl_commit Hans Verkuil
2021-03-19 15:01 ` Ricardo Ribalda Delgado
2021-03-18 20:29 ` [PATCH v7 16/17] media: uvcvideo: Set error_idx during ctrl_commit errors Ricardo Ribalda
2021-03-18 20:29 ` [PATCH v7 17/17] uvc: use vb2 ioctl and fop helpers Ricardo Ribalda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210318202928.166955-16-ribalda@chromium.org \
--to=ribalda@chromium.org \
--cc=hverkuil-cisco@xs4all.nl \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=sergey.senozhatsky@gmail.com \
--cc=tfiga@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®