Re: [PATCH 4/6] usb: gadget: uvc: Remove the hardcoded default color matching

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

Hi Dan,

Thank you for the patch.

On Tue, Dec 13, 2022 at 08:37:34AM +0000, Daniel Scally wrote:
> A hardcoded default color matching descriptor is embedded in struct
> f_uvc_opts but no longer has any use - remove it.
> 
> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

> ---
>  drivers/usb/gadget/function/f_uvc.c | 9 ---------
>  drivers/usb/gadget/function/u_uvc.h | 1 -
>  2 files changed, 10 deletions(-)
> 
> diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c
> index 6e196e06181e..46bdea73cdeb 100644
> --- a/drivers/usb/gadget/function/f_uvc.c
> +++ b/drivers/usb/gadget/function/f_uvc.c
> @@ -793,7 +793,6 @@ static struct usb_function_instance *uvc_alloc_inst(void)
>  	struct uvc_camera_terminal_descriptor *cd;
>  	struct uvc_processing_unit_descriptor *pd;
>  	struct uvc_output_terminal_descriptor *od;
> -	struct uvc_color_matching_descriptor *md;
>  	struct uvc_descriptor_header **ctl_cls;
>  	int ret;
>  
> @@ -842,14 +841,6 @@ static struct usb_function_instance *uvc_alloc_inst(void)
>  	od->bSourceID			= 2;
>  	od->iTerminal			= 0;
>  
> -	md = &opts->uvc_color_matching;
> -	md->bLength			= UVC_DT_COLOR_MATCHING_SIZE;
> -	md->bDescriptorType		= USB_DT_CS_INTERFACE;
> -	md->bDescriptorSubType		= UVC_VS_COLORFORMAT;
> -	md->bColorPrimaries		= 1;
> -	md->bTransferCharacteristics	= 1;
> -	md->bMatrixCoefficients		= 4;
> -
>  	/* Prepare fs control class descriptors for configfs-based gadgets */
>  	ctl_cls = opts->uvc_fs_control_cls;
>  	ctl_cls[0] = NULL;	/* assigned elsewhere by configfs */
> diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h
> index 24b8681b0d6f..577c1c48ca4a 100644
> --- a/drivers/usb/gadget/function/u_uvc.h
> +++ b/drivers/usb/gadget/function/u_uvc.h
> @@ -52,7 +52,6 @@ struct f_uvc_opts {
>  	struct uvc_camera_terminal_descriptor		uvc_camera_terminal;
>  	struct uvc_processing_unit_descriptor		uvc_processing;
>  	struct uvc_output_terminal_descriptor		uvc_output_terminal;
> -	struct uvc_color_matching_descriptor		uvc_color_matching;
>  
>  	/*
>  	 * Control descriptors pointers arrays for full-/high-speed and

-- 
Regards,

Laurent Pinchart