Commit 1da47f54 authored by Viresh Kumar's avatar Viresh Kumar Committed by Greg Kroah-Hartman

USB: Use usb_disabled() consistently

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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 66e3e591
...@@ -1045,7 +1045,7 @@ static void usb_debugfs_cleanup(void) ...@@ -1045,7 +1045,7 @@ static void usb_debugfs_cleanup(void)
static int __init usb_init(void) static int __init usb_init(void)
{ {
int retval; int retval;
if (nousb) { if (usb_disabled()) {
pr_info("%s: USB support disabled\n", usbcore_name); pr_info("%s: USB support disabled\n", usbcore_name);
return 0; return 0;
} }
...@@ -1102,7 +1102,7 @@ static int __init usb_init(void) ...@@ -1102,7 +1102,7 @@ static int __init usb_init(void)
static void __exit usb_exit(void) static void __exit usb_exit(void)
{ {
/* This will matter if shutdown/reboot does exitcalls. */ /* This will matter if shutdown/reboot does exitcalls. */
if (nousb) if (usb_disabled())
return; return;
usb_deregister_device_driver(&usb_generic_driver); usb_deregister_device_driver(&usb_generic_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment