usb: core: use IS_ENABLED() instead of checking for built-in or module

The IS_ENABLED() macro checks if a Kconfig symbol has been enabled either
built-in or as a module, use that macro instead of open coding the same.

Using the macro makes the code more readable by helping abstract away some
of the Kconfig built-in and module enable details.

Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Javier Martinez Canillas 2016-08-18 09:45:04 -04:00 committed by Greg Kroah-Hartman
parent 238b7bd91b
commit f7b7f37549
2 changed files with 2 additions and 2 deletions

View File

@ -3031,7 +3031,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutdown);
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) #if IS_ENABLED(CONFIG_USB_MON)
const struct usb_mon_operations *mon_ops; const struct usb_mon_operations *mon_ops;

View File

@ -38,7 +38,7 @@ static struct usb_device_id whitelist_table[] = {
{ USB_DEVICE(0x0525, 0xa4a2), }, { USB_DEVICE(0x0525, 0xa4a2), },
#endif #endif
#if defined(CONFIG_USB_TEST) || defined(CONFIG_USB_TEST_MODULE) #if IS_ENABLED(CONFIG_USB_TEST)
/* gadget zero, for testing */ /* gadget zero, for testing */
{ USB_DEVICE(0x0525, 0xa4a0), }, { USB_DEVICE(0x0525, 0xa4a0), },
#endif #endif