Re: [PATCH 1/6] usb: gadget: usb: Remove "default" from color matching attributes

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

Hi Dan,

Thank you for the patch.

On Tue, Dec 13, 2022 at 08:37:31AM +0000, Daniel Scally wrote:
> Color matching attributes in the configfs for UVC are named with the
> phrase "default". The implication of that is that they will only be
> used _with_ the default color matching descriptor, and that will
> shortly no longer be the case.
> 
> Remove the "default" from the color matching descriptor attribute
> variables.
> 
> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>

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

> ---
>  drivers/usb/gadget/function/uvc_configfs.c | 29 +++++++++++-----------
>  1 file changed, 14 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
> index 4303a3283ba0..26d092790f12 100644
> --- a/drivers/usb/gadget/function/uvc_configfs.c
> +++ b/drivers/usb/gadget/function/uvc_configfs.c
> @@ -1783,8 +1783,8 @@ static const struct uvcg_config_group_type uvcg_mjpeg_grp_type = {
>   * streaming/color_matching/default
>   */
>  
> -#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, bits)		\
> -static ssize_t uvcg_default_color_matching_##cname##_show(		\
> +#define UVCG_COLOR_MATCHING_ATTR(cname, aname, bits)			\
> +static ssize_t uvcg_color_matching_##cname##_show(			\
>  	struct config_item *item, char *page)				\
>  {									\
>  	struct config_group *group = to_config_group(item);		\
> @@ -1808,26 +1808,25 @@ static ssize_t uvcg_default_color_matching_##cname##_show(		\
>  	return result;							\
>  }									\
>  									\
> -UVC_ATTR_RO(uvcg_default_color_matching_, cname, aname)
> +UVC_ATTR_RO(uvcg_color_matching_, cname, aname)
>  
> -UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
> -UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_transfer_characteristics,
> -				 bTransferCharacteristics, 8);
> -UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients, 8);
> +UVCG_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
> +UVCG_COLOR_MATCHING_ATTR(b_transfer_characteristics, bTransferCharacteristics, 8);
> +UVCG_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients, 8);
>  
> -#undef UVCG_DEFAULT_COLOR_MATCHING_ATTR
> +#undef UVCG_COLOR_MATCHING_ATTR
>  
> -static struct configfs_attribute *uvcg_default_color_matching_attrs[] = {
> -	&uvcg_default_color_matching_attr_b_color_primaries,
> -	&uvcg_default_color_matching_attr_b_transfer_characteristics,
> -	&uvcg_default_color_matching_attr_b_matrix_coefficients,
> +static struct configfs_attribute *uvcg_color_matching_attrs[] = {
> +	&uvcg_color_matching_attr_b_color_primaries,
> +	&uvcg_color_matching_attr_b_transfer_characteristics,
> +	&uvcg_color_matching_attr_b_matrix_coefficients,
>  	NULL,
>  };
>  
> -static const struct uvcg_config_group_type uvcg_default_color_matching_type = {
> +static const struct uvcg_config_group_type uvcg_color_matching_type = {
>  	.type = {
>  		.ct_item_ops	= &uvcg_config_item_ops,
> -		.ct_attrs	= uvcg_default_color_matching_attrs,
> +		.ct_attrs	= uvcg_color_matching_attrs,
>  		.ct_owner	= THIS_MODULE,
>  	},
>  	.name = "default",
> @@ -1844,7 +1843,7 @@ static const struct uvcg_config_group_type uvcg_color_matching_grp_type = {
>  	},
>  	.name = "color_matching",
>  	.children = (const struct uvcg_config_group_type*[]) {
> -		&uvcg_default_color_matching_type,
> +		&uvcg_color_matching_type,
>  		NULL,
>  	},
>  };

-- 
Regards,

Laurent Pinchart