Hi Andrzej,
Thank you for the patch.
On Friday 05 December 2014 15:16:34 Andrzej Pietrasiewicz wrote:
> When configfs is integrated, CONFIGFS_ATTR_STRUCT and CONFIGFS_ATTR_OPS
> macros should be used, but the latter expects that tere is a to_f_uvc_opts
> function accepting a config_item, whereas the macro being changed
> can be applied to a different type of argument.
>
> Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@xxxxxxxxxxx>
Acked-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/usb/gadget/function/f_uvc.c | 6 +++---
> drivers/usb/gadget/function/u_uvc.h | 2 +-
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/usb/gadget/function/f_uvc.c
> b/drivers/usb/gadget/function/f_uvc.c index 945b3bd..5b4ab39 100644
> --- a/drivers/usb/gadget/function/f_uvc.c
> +++ b/drivers/usb/gadget/function/f_uvc.c
> @@ -605,7 +605,7 @@ uvc_function_bind(struct usb_configuration *c, struct
> usb_function *f)
>
> INFO(cdev, "uvc_function_bind\n");
>
> - opts = to_f_uvc_opts(f->fi);
> + opts = fi_to_f_uvc_opts(f->fi);
> /* Sanity check the streaming endpoint module parameters.
> */
> opts->streaming_interval = clamp(opts->streaming_interval, 1U, 16U);
> @@ -766,7 +766,7 @@ error:
>
> static void uvc_free_inst(struct usb_function_instance *f)
> {
> - struct f_uvc_opts *opts = to_f_uvc_opts(f);
> + struct f_uvc_opts *opts = fi_to_f_uvc_opts(f);
>
> kfree(opts);
> }
> @@ -818,7 +818,7 @@ static struct usb_function *uvc_alloc(struct
> usb_function_instance *fi) return ERR_PTR(-ENOMEM);
>
> uvc->state = UVC_STATE_DISCONNECTED;
> - opts = to_f_uvc_opts(fi);
> + opts = fi_to_f_uvc_opts(fi);
>
> uvc->desc.fs_control = opts->fs_control;
> uvc->desc.ss_control = opts->ss_control;
> diff --git a/drivers/usb/gadget/function/u_uvc.h
> b/drivers/usb/gadget/function/u_uvc.h index 2a8dfdf..c0706a3 100644
> --- a/drivers/usb/gadget/function/u_uvc.h
> +++ b/drivers/usb/gadget/function/u_uvc.h
> @@ -18,7 +18,7 @@
>
> #include <linux/usb/composite.h>
>
> -#define to_f_uvc_opts(f) container_of(f, struct f_uvc_opts, func_inst)
> +#define fi_to_f_uvc_opts(f) container_of(f, struct f_uvc_opts, func_inst)
>
> struct f_uvc_opts {
> struct usb_function_instance func_inst;
--
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
