mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
usb: gadget: usb: Remove "default" from color matching attributes
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> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Link: https://lore.kernel.org/r/20221213083736.2284536-2-dan.scally@ideasonboard.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
263b628ff9
commit
4a0192c01e
1 changed files with 14 additions and 15 deletions
|
@ -1783,8 +1783,8 @@ static const struct uvcg_config_group_type uvcg_mjpeg_grp_type = {
|
||||||
* streaming/color_matching/default
|
* streaming/color_matching/default
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define UVCG_DEFAULT_COLOR_MATCHING_ATTR(cname, aname, bits) \
|
#define UVCG_COLOR_MATCHING_ATTR(cname, aname, bits) \
|
||||||
static ssize_t uvcg_default_color_matching_##cname##_show( \
|
static ssize_t uvcg_color_matching_##cname##_show( \
|
||||||
struct config_item *item, char *page) \
|
struct config_item *item, char *page) \
|
||||||
{ \
|
{ \
|
||||||
struct config_group *group = to_config_group(item); \
|
struct config_group *group = to_config_group(item); \
|
||||||
|
@ -1808,26 +1808,25 @@ static ssize_t uvcg_default_color_matching_##cname##_show( \
|
||||||
return result; \
|
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_COLOR_MATCHING_ATTR(b_color_primaries, bColorPrimaries, 8);
|
||||||
UVCG_DEFAULT_COLOR_MATCHING_ATTR(b_transfer_characteristics,
|
UVCG_COLOR_MATCHING_ATTR(b_transfer_characteristics, bTransferCharacteristics, 8);
|
||||||
bTransferCharacteristics, 8);
|
UVCG_COLOR_MATCHING_ATTR(b_matrix_coefficients, bMatrixCoefficients, 8);
|
||||||
UVCG_DEFAULT_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[] = {
|
static struct configfs_attribute *uvcg_color_matching_attrs[] = {
|
||||||
&uvcg_default_color_matching_attr_b_color_primaries,
|
&uvcg_color_matching_attr_b_color_primaries,
|
||||||
&uvcg_default_color_matching_attr_b_transfer_characteristics,
|
&uvcg_color_matching_attr_b_transfer_characteristics,
|
||||||
&uvcg_default_color_matching_attr_b_matrix_coefficients,
|
&uvcg_color_matching_attr_b_matrix_coefficients,
|
||||||
NULL,
|
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 = {
|
.type = {
|
||||||
.ct_item_ops = &uvcg_config_item_ops,
|
.ct_item_ops = &uvcg_config_item_ops,
|
||||||
.ct_attrs = uvcg_default_color_matching_attrs,
|
.ct_attrs = uvcg_color_matching_attrs,
|
||||||
.ct_owner = THIS_MODULE,
|
.ct_owner = THIS_MODULE,
|
||||||
},
|
},
|
||||||
.name = "default",
|
.name = "default",
|
||||||
|
@ -1844,7 +1843,7 @@ static const struct uvcg_config_group_type uvcg_color_matching_grp_type = {
|
||||||
},
|
},
|
||||||
.name = "color_matching",
|
.name = "color_matching",
|
||||||
.children = (const struct uvcg_config_group_type*[]) {
|
.children = (const struct uvcg_config_group_type*[]) {
|
||||||
&uvcg_default_color_matching_type,
|
&uvcg_color_matching_type,
|
||||||
NULL,
|
NULL,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue