From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 22 Nov 2008 02:31:06 +0000 (+1030)
Subject: USB: Don't use __module_param_call; use core_param.
X-Git-Tag: v2.6.29-rc1~182^2~83
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=785895ff1fedddd09576d2c600d90404fef6506c;p=linux-2.6-omap-h63xx.git

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>
---

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>