@@ -2310,13 +2310,13 @@ static int tcm_init(void)
{
int ret;
- ret = usb_function_register(&tcmusb_func);
+ ret = usb_function_register(&tcm_usb_func);
if (ret)
return ret;
ret = target_register_template(&usbg_ops);
if (ret)
- usb_function_unregister(&tcmusb_func);
+ usb_function_unregister(&tcm_usb_func);
return ret;
}
@@ -2325,7 +2325,7 @@ module_init(tcm_init);
static void tcm_exit(void)
{
target_unregister_template(&usbg_ops);
- usb_function_unregister(&tcmusb_func);
+ usb_function_unregister(&tcm_usb_func);
}
module_exit(tcm_exit);
@@ -611,7 +611,7 @@ int usb_add_config_only(struct usb_composite_dev *cdev,
void usb_remove_function(struct usb_configuration *c, struct usb_function *f);
#define DECLARE_USB_FUNCTION(_name, _inst_alloc, _func_alloc) \
- static struct usb_function_driver _name ## usb_func = { \
+ static struct usb_function_driver _name ## _usb_func = { \
.name = __stringify(_name), \
.mod = THIS_MODULE, \
.alloc_inst = _inst_alloc, \
@@ -621,16 +621,16 @@ void usb_remove_function(struct usb_configuration *c, struct usb_function *f);
#define DECLARE_USB_FUNCTION_INIT(_name, _inst_alloc, _func_alloc) \
DECLARE_USB_FUNCTION(_name, _inst_alloc, _func_alloc) \
- static int __init _name ## mod_init(void) \
+ static int __init _name ## _mod_init(void) \
{ \
- return usb_function_register(&_name ## usb_func); \
+ return usb_function_register(&_name ## _usb_func); \
} \
- static void __exit _name ## mod_exit(void) \
+ static void __exit _name ## _mod_exit(void) \
{ \
- usb_function_unregister(&_name ## usb_func); \
+ usb_function_unregister(&_name ## _usb_func); \
} \
- module_init(_name ## mod_init); \
- module_exit(_name ## mod_exit)
+ module_init(_name ## _mod_init); \
+ module_exit(_name ## _mod_exit)
/* messaging utils */
#define DBG(d, fmt, args...) \
DECLARE_USB_FUNCTION_INIT(ffs, ffs_alloc_inst, ffs_alloc) will generate function ffsmod_init/ffsmod_exit() and variable ffsusb_func. Add possible character '_' in the macros which will generate function/variable name in common format, ffs_mod_init/ffs_mod_exit() and ffs_usb_func. f_tcm.c doing more thing in module init/exit, it will not use DECLARE_USB_FUNCTION_INIT() macro, but we change DECLARE_USB_FUNCTION() macro, it will change static struct usb_function_driver variable from tcmusb_func to tcm_usb_func, so update tcm_init()/tcm_exit() to use tcm_usb_func. Signed-off-by: Linyu Yuan <quic_linyyuan@quicinc.com> --- v2: fix build issue from kernel test robot <lkp@intel.com> v3: change commit description and add f_tcm.c change drivers/usb/gadget/function/f_tcm.c | 6 +++--- include/linux/usb/composite.h | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-)