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>

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)
 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 @@ out:
 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);