diff options
author | Viresh Kumar <viresh.kumar@linaro.org> | 2015-03-19 23:34:40 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-26 05:48:22 -0400 |
commit | 1da47f54ddaf99d2fa8b4319480d49b88ff5fc2c (patch) | |
tree | a68677db11fe60bbed2f60dbd30f546237fe9915 | |
parent | 66e3e591891da9899a8990792da080432531ffd4 (diff) |
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: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/usb/core/usb.c | 4 |
1 files 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) | |||
1045 | static int __init usb_init(void) | 1045 | static int __init usb_init(void) |
1046 | { | 1046 | { |
1047 | int retval; | 1047 | int retval; |
1048 | if (nousb) { | 1048 | if (usb_disabled()) { |
1049 | pr_info("%s: USB support disabled\n", usbcore_name); | 1049 | pr_info("%s: USB support disabled\n", usbcore_name); |
1050 | return 0; | 1050 | return 0; |
1051 | } | 1051 | } |
@@ -1102,7 +1102,7 @@ out: | |||
1102 | static void __exit usb_exit(void) | 1102 | static void __exit usb_exit(void) |
1103 | { | 1103 | { |
1104 | /* This will matter if shutdown/reboot does exitcalls. */ | 1104 | /* This will matter if shutdown/reboot does exitcalls. */ |
1105 | if (nousb) | 1105 | if (usb_disabled()) |
1106 | return; | 1106 | return; |
1107 | 1107 | ||
1108 | usb_deregister_device_driver(&usb_generic_driver); | 1108 | usb_deregister_device_driver(&usb_generic_driver); |