Hi Petr,
Thank you for the patch.
On Tuesday 07 Mar 2017 00:57:20 Petr Cvek wrote:
> Commit 76e0da34c7ce ("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.
Why don't you just
- UVC_ATTR(f_uvc_opts_, cname, aname)
+ UVC_ATTR(f_uvc_opts_, cname, cname)
in the definition of the UVCG_OPTS_ATTR() macro ?
> Signed-off-by: Petr Cvek <petr.cvek@xxxxxx>
> ---
> drivers/usb/gadget/function/uvc_configfs.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/usb/gadget/function/uvc_configfs.c
> b/drivers/usb/gadget/function/uvc_configfs.c index
> 4e037d2a7a60..3a36b2e85788 100644
> --- a/drivers/usb/gadget/function/uvc_configfs.c
> +++ b/drivers/usb/gadget/function/uvc_configfs.c
> @@ -2125,7 +2125,7 @@ static struct configfs_item_operations uvc_item_ops =
> { .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( \
> struct config_item *item, char *page) \
> { \
> @@ -2172,12 +2172,12 @@ UVC_ATTR(f_uvc_opts_, cname, aname)
>
> #define identity_conv(x) (x)
>
> -UVCG_OPTS_ATTR(streaming_interval, identity_conv, kstrtou8, u8,
> identity_conv, - 16);
> -UVCG_OPTS_ATTR(streaming_maxpacket, le16_to_cpu, kstrtou16, u16,
> le16_to_cpu, - 3072);
> -UVCG_OPTS_ATTR(streaming_maxburst, identity_conv, kstrtou8, u8,
> identity_conv, - 15);
> +UVCG_OPTS_ATTR(streaming_interval, streaming_interval, identity_conv,
> + kstrtou8, u8, identity_conv, 16);
> +UVCG_OPTS_ATTR(streaming_maxpacket, streaming_maxpacket, le16_to_cpu,
> + kstrtou16, u16, le16_to_cpu, 3072);
> +UVCG_OPTS_ATTR(streaming_maxburst, streaming_maxburst, identity_conv,
> + kstrtou8, u8, identity_conv, 15);
>
> #undef identity_conv
--
Regards,
Laurent Pinchart
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
