Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam fabio.estevam@freescale.com --- Changes since v1: - Fix Subject and commit log
sound/soc/codecs/wm8990.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 253c88b..34f0020 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c @@ -1376,7 +1376,7 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8990 = { .volatile_register = wm8990_volatile_register, };
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) static int wm8990_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -1423,7 +1423,7 @@ static struct i2c_driver wm8990_i2c_driver = { static int __init wm8990_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) ret = i2c_add_driver(&wm8990_i2c_driver); if (ret != 0) { printk(KERN_ERR "Failed to register wm8990 I2C driver: %d\n", @@ -1436,7 +1436,7 @@ module_init(wm8990_modinit);
static void __exit wm8990_exit(void) { -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) i2c_del_driver(&wm8990_i2c_driver); #endif }