Commit 5eb519f3 authored by Javier Martinez Canillas's avatar Javier Martinez Canillas Committed by Lee Jones
Browse files

mfd: Use IS_ENABLED(CONFIG_FOO) instead of checking FOO || FOO_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.

Signed-off-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent d6441dc5

drivers/mfd/dm355evm_msp.c

+4 −4
Original line number Diff line number Diff line
@@ -33,25 +33,25 @@ 
 * This driver was tested with firmware revision A4.

 */



#if defined(CONFIG_INPUT_DM355EVM) || defined(CONFIG_INPUT_DM355EVM_MODULE)

#if IS_ENABLED(CONFIG_INPUT_DM355EVM)

#define msp_has_keyboard()	true

#else

#define msp_has_keyboard()	false

#endif



#if defined(CONFIG_LEDS_GPIO) || defined(CONFIG_LEDS_GPIO_MODULE)

#if IS_ENABLED(CONFIG_LEDS_GPIO)

#define msp_has_leds()		true

#else

#define msp_has_leds()		false

#endif



#if defined(CONFIG_RTC_DRV_DM355EVM) || defined(CONFIG_RTC_DRV_DM355EVM_MODULE)

#if IS_ENABLED(CONFIG_RTC_DRV_DM355EVM)

#define msp_has_rtc()		true

#else

#define msp_has_rtc()		false

#endif



#if defined(CONFIG_VIDEO_TVP514X) || defined(CONFIG_VIDEO_TVP514X_MODULE)

#if IS_ENABLED(CONFIG_VIDEO_TVP514X)

#define msp_has_tvp()		true

#else

#define msp_has_tvp()		false

drivers/mfd/wm8400-core.c

+3 −3
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ void wm8400_reset_codec_reg_cache(struct wm8400 *wm8400) 
}

EXPORT_SYMBOL_GPL(wm8400_reset_codec_reg_cache);



#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

#if IS_ENABLED(CONFIG_I2C)

static int wm8400_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

{
@@ -165,7 +165,7 @@ static int __init wm8400_module_init(void) 
{

	int ret = -ENODEV;



#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

#if IS_ENABLED(CONFIG_I2C)

	ret = i2c_add_driver(&wm8400_i2c_driver);

	if (ret != 0)

		pr_err("Failed to register I2C driver: %d\n", ret);
@@ -177,7 +177,7 @@ subsys_initcall(wm8400_module_init); 


static void __exit wm8400_module_exit(void)

{

#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)

#if IS_ENABLED(CONFIG_I2C)

	i2c_del_driver(&wm8400_i2c_driver);

#endif

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE