diff options
| author | Andrzej Pietrasiewicz <andrzej.p@samsung.com> | 2014-12-10 12:34:00 +0100 |
|---|---|---|
| committer | Felipe Balbi <balbi@ti.com> | 2015-01-12 12:13:26 -0600 |
| commit | bbea6de1bd12dd509f774f2a3165216eeac7bc54 (patch) | |
| tree | 47d75c3d430fe24a1a5dacd66555844cc297ebfd /drivers/usb/gadget/function/u_uvc.h | |
| parent | 6b1b0fe0698f0e4d528a33f43d5c56f7e6e8f756 (diff) | |
| download | blackbird-op-linux-bbea6de1bd12dd509f774f2a3165216eeac7bc54.tar.gz blackbird-op-linux-bbea6de1bd12dd509f774f2a3165216eeac7bc54.zip | |
usb: gadget: f_uvc: rename a macro to avoid conflicts
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@samsung.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/function/u_uvc.h')
| -rw-r--r-- | drivers/usb/gadget/function/u_uvc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/gadget/function/u_uvc.h b/drivers/usb/gadget/function/u_uvc.h index 2a8dfdff0332..c0706a3d7019 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; |
