From 1da47f54ddaf99d2fa8b4319480d49b88ff5fc2c Mon Sep 17 00:00:00 2001 From: Viresh Kumar Date: Fri, 20 Mar 2015 09:04:40 +0530 Subject: [PATCH] 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 Signed-off-by: Greg Kroah-Hartman --- 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 @@ 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); -- 2.30.2