From: Oliver Neukum <oneukum@suse.com>
Date: Thu, 3 Dec 2015 14:03:33 +0000 (+0100)
Subject: usb: make "nousb" a clear module parameter
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=097a9ea0e48fa33159ad47d1dc9ef3b215bfc090;p=linux-beck.git

usb: make "nousb" a clear module parameter

It shouldn't matter how usbcore is compiled. As it is a subsystem,
the correct way to use nousb should be usbcore.nousb

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c
index f8bbd0b6d9fe..77e4c9bc0ab1 100644
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@@ -49,12 +49,7 @@ const char *usbcore_name = "usbcore";
 
 static bool nousb;	/* Disable USB when built into kernel image */
 
-/* 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>