aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-11-22 13:01:06 +1030
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-07 09:59:58 -0800
commit785895ff1fedddd09576d2c600d90404fef6506c (patch)
treeef1a50c7efaebb8afdebedbbda48a3fb43f25df4
parent96983d2d861bf94b7f70bc47ac3c5b289f519a2d (diff)
downloadmrst-s0i3-test-785895ff1fedddd09576d2c600d90404fef6506c.tar.gz
mrst-s0i3-test-785895ff1fedddd09576d2c600d90404fef6506c.tar.xz
mrst-s0i3-test-785895ff1fedddd09576d2c600d90404fef6506c.zip
USB: Don't use __module_param_call; use core_param.
Impact: cleanup 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, so we need the #ifdef MODULE. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Cc: Pete Zaitcev <zaitcev@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/usb/core/usb.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index 44f2fc750b6..51854c2bc91 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -954,8 +954,12 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in,
}
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);
+/* To disable USB, kernel command line is 'nousb' not 'usbcore.nousb' */
+#ifdef MODULE
+module_param(nousb, bool, 0444);
+#else
+core_param(nousb, nousb, bool, 0444);
+#endif
/*
* for external read access to <nousb>