Hi Ricardo,
Thank you for the patch.
On Mon, Mar 18, 2024 at 11:55:26PM +0000, Ricardo Ribalda wrote:
> We do not have more version specific mappings. Let's remove this code
> for now. It can be easily reverted later if needed.
>
> Signed-off-by: Ricardo Ribalda <ribalda@xxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/usb/uvc/uvc_ctrl.c | 21 ---------------------
> 1 file changed, 21 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c
> index 9a0b81aca30d1..41578ded1174e 100644
> --- a/drivers/media/usb/uvc/uvc_ctrl.c
> +++ b/drivers/media/usb/uvc/uvc_ctrl.c
> @@ -851,14 +851,6 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = {
> },
> };
>
> -static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc11[] = {
> - NULL, /* Sentinel */
> -};
> -
> -static const struct uvc_control_mapping *uvc_ctrl_mappings_uvc15[] = {
> - NULL, /* Sentinel */
> -};
> -
> /* ------------------------------------------------------------------------
> * Utility functions
> */
> @@ -2660,7 +2652,6 @@ static void uvc_ctrl_prune_entity(struct uvc_device *dev,
> static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
> struct uvc_control *ctrl)
> {
> - const struct uvc_control_mapping **mappings;
> unsigned int i;
>
> /*
> @@ -2726,18 +2717,6 @@ static void uvc_ctrl_init_ctrl(struct uvc_video_chain *chain,
> ctrl->info.selector == mapping->selector)
> __uvc_ctrl_add_custom_mapping(chain, ctrl, mapping);
> }
> -
> - /* Finally process version-specific mappings. */
> - mappings = chain->dev->uvc_version < 0x0150
> - ? uvc_ctrl_mappings_uvc11 : uvc_ctrl_mappings_uvc15;
> -
> - for (i = 0; mappings[i]; ++i) {
> - const struct uvc_control_mapping *mapping = mappings[i];
> -
> - if (uvc_entity_match_guid(ctrl->entity, mapping->entity) &&
> - ctrl->info.selector == mapping->selector)
> - __uvc_ctrl_add_custom_mapping(chain, ctrl, mapping);
> - }
> }
>
> /*
--
Regards,
Laurent Pinchart
