Hi Ricardo,
This patch looks good to me.
Reviewed-by: Yunke Cao <yunkec@xxxxxxxxxx>
Thanks,
Yunke
On Fri, Nov 15, 2024 at 4:11 AM Ricardo Ribalda <ribalda@xxxxxxxxxxxx> wrote:
>
> Centralize the calculation for the v4l2_size of a mapping.
>
> Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
> ---
> 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 1bc019138995..f262e05ad3a8 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -1463,6 +1463,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,
> @@ -1504,7 +1512,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) {
> @@ -2093,7 +2101,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;
> @@ -2271,9 +2279,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;
>
>
> --
> 2.47.0.338.g60cca15819-goog
>
