USB: Don't use __module_param_call Found this when I changed args to __module_param_call. We now have core_param for exactly this, but Greg assures me "nousb" is used as a module parameter, using the method suggested in moduleparam.h will have to do. Signed-off-by: Rusty Russell Cc: Greg Kroah-Hartman Cc: Pete Zaitcev --- drivers/usb/core/usb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -962,9 +962,6 @@ void usb_buffer_unmap_sg(const struct us } EXPORT_SYMBOL_GPL(usb_buffer_unmap_sg); -/* format to disable USB on kernel command line is: nousb */ -__module_param_call("", nousb, param_set_bool, param_get_bool, &nousb, 0444); - /* * for external read access to */ @@ -1052,6 +1049,11 @@ static void __exit usb_exit(void) ksuspend_usb_cleanup(); } +/* To disable USB, kernel command line is 'nousb' not 'usbcore.nousb' */ +#undef MODULE_PARAM_PREFIX +#define MODULE_PARAM_PREFIX +module_param(nousb, bool, 0444); + subsys_initcall(usb_init); module_exit(usb_exit); MODULE_LICENSE("GPL");