openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Viresh Kumar 2015-03-20 09:04:40 +05:30 committed by Greg Kroah-Hartman
parent 66e3e59189
commit 1da47f54dd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/core/usb.c
View File

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