At few places we have used usb_disabled() and at other places used 'nousb' directly. Lets be consistent and use usb_disabled();
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org --- drivers/usb/core/usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index b1fb9aef0f5b..006951728520 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -1045,7 +1045,7 @@ static void usb_debugfs_cleanup(void) static int __init usb_init(void) { int retval; - if (nousb) { + if (usb_disabled()) { pr_info("%s: USB support disabled\n", usbcore_name); return 0; } @@ -1102,7 +1102,7 @@ static int __init usb_init(void) static void __exit usb_exit(void) { /* This will matter if shutdown/reboot does exitcalls. */ - if (nousb) + if (usb_disabled()) return;
usb_deregister_device_driver(&usb_generic_driver);
Move usb_disabled() and module_param()/core_param() towards the top of the file, where 'nousb' is defined, as they are all related.
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org --- drivers/usb/core/usb.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 006951728520..8d5b2f4113cd 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -49,6 +49,22 @@ 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> + */ +int usb_disabled(void) +{ + return nousb; +} +EXPORT_SYMBOL_GPL(usb_disabled); + #ifdef CONFIG_PM static int usb_autosuspend_delay = 2; /* Default delay value, * in seconds */ @@ -964,22 +980,6 @@ void usb_buffer_unmap_sg(const struct usb_device *dev, int is_in, EXPORT_SYMBOL_GPL(usb_buffer_unmap_sg); #endif
-/* 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> - */ -int usb_disabled(void) -{ - return nousb; -} -EXPORT_SYMBOL_GPL(usb_disabled); - /* * Notifications of device and interface registration */
linaro-kernel@lists.linaro.org
-
Viresh Kumar