[media.git/next] media: uvcvideo: Introduce uvc_mapping_v4l2_size

[media-ci]

On Mon Feb 3 11:55:50 2025 +0000, Ricardo Ribalda wrote:
> Centralize the calculation for the v4l2_size of a mapping.
> 
> Reviewed-by: Yunke Cao <yun...@google.com>
> Tested-by: Yunke Cao <yun...@google.com>
> Reviewed-by: Hans de Goede <hdego...@redhat.com>
> Signed-off-by: Ricardo Ribalda <riba...@chromium.org>
> Link: 
> https://lore.kernel.org/r/20250203-uvc-roi-v17-14-5900a9fed...@chromium.org
> Signed-off-by: Hans de Goede <hdego...@redhat.com>
> Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>

Patch committed.

Thanks,
Hans Verkuil

 drivers/media/usb/uvc/uvc_ctrl.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

---

diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
index d50137d19561..17a7ce525f71 100644
--- a/drivers/media/usb/uvc/uvc_ctrl.c
+++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -1471,6 +1471,14 @@ static int __uvc_queryctrl_boundaries(struct 
uvc_video_chain *chain,
        return 0;
 }
 
+static size_t uvc_mapping_v4l2_size(struct uvc_control_mapping *mapping)
+{
+       if (uvc_ctrl_mapping_is_compound(mapping))
+               return DIV_ROUND_UP(mapping->size, 8);
+
+       return sizeof(s32);
+}
+
 static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain,
                                 struct uvc_control *ctrl,
                                 struct uvc_control_mapping *mapping,
@@ -1512,7 +1520,7 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain 
*chain,
                        v4l2_ctrl->flags |= V4L2_CTRL_FLAG_INACTIVE;
        }
 
-       v4l2_ctrl->elem_size = sizeof(s32);
+       v4l2_ctrl->elem_size = uvc_mapping_v4l2_size(mapping);
        v4l2_ctrl->elems = 1;
 
        if (v4l2_ctrl->type >= V4L2_CTRL_COMPOUND_TYPES) {
@@ -2144,7 +2152,7 @@ static int uvc_mapping_get_xctrl_compound(struct 
uvc_video_chain *chain,
                return -EINVAL;
        }
 
-       size = DIV_ROUND_UP(mapping->size, 8);
+       size = uvc_mapping_v4l2_size(mapping);
        if (xctrl->size < size) {
                xctrl->size = size;
                return -ENOSPC;
@@ -2327,9 +2335,8 @@ static int uvc_mapping_set_xctrl_compound(struct 
uvc_control *ctrl,
                                          struct v4l2_ext_control *xctrl)
 {
        u8 *data __free(kfree) = NULL;
-       size_t size;
+       size_t size = uvc_mapping_v4l2_size(mapping);
 
-       size = DIV_ROUND_UP(mapping->size, 8);
        if (xctrl->size != size)
                return -EINVAL;