Commit f58c4fc4 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

ASoC: wm8580: Use IS_ENABLED() macro

Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1
...@@ -941,7 +941,7 @@ static const struct regmap_config wm8580_regmap = { ...@@ -941,7 +941,7 @@ static const struct regmap_config wm8580_regmap = {
.volatile_reg = wm8580_volatile, .volatile_reg = wm8580_volatile,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
static int wm8580_i2c_probe(struct i2c_client *i2c, static int wm8580_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -1003,7 +1003,7 @@ static int __init wm8580_modinit(void) ...@@ -1003,7 +1003,7 @@ static int __init wm8580_modinit(void)
{ {
int ret = 0; int ret = 0;
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
ret = i2c_add_driver(&wm8580_i2c_driver); ret = i2c_add_driver(&wm8580_i2c_driver);
if (ret != 0) { if (ret != 0) {
pr_err("Failed to register WM8580 I2C driver: %d\n", ret); pr_err("Failed to register WM8580 I2C driver: %d\n", ret);
...@@ -1016,7 +1016,7 @@ module_init(wm8580_modinit); ...@@ -1016,7 +1016,7 @@ module_init(wm8580_modinit);
static void __exit wm8580_exit(void) static void __exit wm8580_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&wm8580_i2c_driver); i2c_del_driver(&wm8580_i2c_driver);
#endif #endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment