Commit 57ddb8ea authored by Petr Cvek's avatar Petr Cvek Committed by Greg Kroah-Hartman

usb: gadget: uvc: Missing files for configfs interface

commit c8cd7510 upstream.

Commit 76e0da34 ("usb-gadget/uvc: use per-attribute show and store
methods") caused a stringification of an undefined macro argument "aname",
so three UVC parameters (streaming_interval, streaming_maxpacket and
streaming_maxburst) were named "aname".

Add the definition of "aname" to the main macro and name the filenames as
originaly intended.
Signed-off-by: default avatarPetr Cvek <petr.cvek@tul.cz>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0b376535
...@@ -2140,7 +2140,7 @@ static struct configfs_item_operations uvc_item_ops = { ...@@ -2140,7 +2140,7 @@ static struct configfs_item_operations uvc_item_ops = {
.release = uvc_attr_release, .release = uvc_attr_release,
}; };
#define UVCG_OPTS_ATTR(cname, conv, str2u, uxx, vnoc, limit) \ #define UVCG_OPTS_ATTR(cname, aname, conv, str2u, uxx, vnoc, limit) \
static ssize_t f_uvc_opts_##cname##_show( \ static ssize_t f_uvc_opts_##cname##_show( \
struct config_item *item, char *page) \ struct config_item *item, char *page) \
{ \ { \
...@@ -2183,16 +2183,16 @@ end: \ ...@@ -2183,16 +2183,16 @@ end: \
return ret; \ return ret; \
} \ } \
\ \
UVC_ATTR(f_uvc_opts_, cname, aname) UVC_ATTR(f_uvc_opts_, cname, cname)
#define identity_conv(x) (x) #define identity_conv(x) (x)
UVCG_OPTS_ATTR(streaming_interval, identity_conv, kstrtou8, u8, identity_conv, UVCG_OPTS_ATTR(streaming_interval, streaming_interval, identity_conv,
16); kstrtou8, u8, identity_conv, 16);
UVCG_OPTS_ATTR(streaming_maxpacket, le16_to_cpu, kstrtou16, u16, le16_to_cpu, UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, le16_to_cpu,
3072); kstrtou16, u16, le16_to_cpu, 3072);
UVCG_OPTS_ATTR(streaming_maxburst, identity_conv, kstrtou8, u8, identity_conv, UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, identity_conv,
15); kstrtou8, u8, identity_conv, 15);
#undef identity_conv #undef identity_conv
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment