linux-next: build failure after merge of the usb-gadget tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Felipe,

After merging the usb-gadget tree, today's linux-next build (x86_64
allmodconfig) failed like this:

In file included from include/linux/module.h:17:0,
                 from drivers/usb/gadget/legacy/nokia.c:19:
drivers/usb/gadget/legacy/nokia.c: In function '__check_num_buffers':
drivers/usb/gadget/function/f_mass_storage.h:51:34: error: 'fsg_num_buffers' undeclared (first use in this function)
  module_param_named(num_buffers, fsg_num_buffers, uint, S_IRUGO);\
                                  ^
include/linux/moduleparam.h:387:68: note: in definition of macro '__param_check'
  static inline type __always_unused *__check_##name(void) { return(p); }
                                                                    ^
include/linux/moduleparam.h:145:2: note: in expansion of macro 'param_check_uint'
  param_check_##type(name, &(value));       \
  ^
drivers/usb/gadget/function/f_mass_storage.h:51:2: note: in expansion of macro 'module_param_named'
  module_param_named(num_buffers, fsg_num_buffers, uint, S_IRUGO);\
  ^
drivers/usb/gadget/legacy/nokia.c:45:1: note: in expansion of macro 'FSG_MODULE_PARAMETERS'
 FSG_MODULE_PARAMETERS(/* no prefix */, fsg_mod_data);
 ^
drivers/usb/gadget/function/f_mass_storage.h:51:34: note: each undeclared identifier is reported only once for each function it appears in
  module_param_named(num_buffers, fsg_num_buffers, uint, S_IRUGO);\
                                  ^
include/linux/moduleparam.h:387:68: note: in definition of macro '__param_check'
  static inline type __always_unused *__check_##name(void) { return(p); }
                                                                    ^
include/linux/moduleparam.h:145:2: note: in expansion of macro 'param_check_uint'
  param_check_##type(name, &(value));       \
  ^
drivers/usb/gadget/function/f_mass_storage.h:51:2: note: in expansion of macro 'module_param_named'
  module_param_named(num_buffers, fsg_num_buffers, uint, S_IRUGO);\
  ^
drivers/usb/gadget/legacy/nokia.c:45:1: note: in expansion of macro 'FSG_MODULE_PARAMETERS'
 FSG_MODULE_PARAMETERS(/* no prefix */, fsg_mod_data);
 ^
drivers/usb/gadget/legacy/nokia.c: At top level:
drivers/usb/gadget/function/f_mass_storage.h:51:34: error: 'fsg_num_buffers' undeclared here (not in a function)
  module_param_named(num_buffers, fsg_num_buffers, uint, S_IRUGO);\
                                  ^
include/linux/moduleparam.h:224:22: note: in definition of macro '__module_param_call'
      level, flags, { arg } }
                      ^
include/linux/moduleparam.h:146:2: note: in expansion of macro 'module_param_cb'
  module_param_cb(name, &param_ops_##type, &value, perm);     \
  ^
drivers/usb/gadget/function/f_mass_storage.h:51:2: note: in expansion of macro 'module_param_named'
  module_param_named(num_buffers, fsg_num_buffers, uint, S_IRUGO);\
  ^
drivers/usb/gadget/legacy/nokia.c:45:1: note: in expansion of macro 'FSG_MODULE_PARAMETERS'
 FSG_MODULE_PARAMETERS(/* no prefix */, fsg_mod_data);
 ^

Caused by commit e4f8ef7b0770 ("usb: gadget: nokia: Add mass storage
driver to g_nokia").

I have used the usb-gadget tree from next-20150528 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpd7RphRn2ek.pgp
Description: OpenPGP digital signature