Commit 06b2bd23 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown

ASoC: uda1380: 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
...@@ -794,7 +794,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = { ...@@ -794,7 +794,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda1380 = {
.num_dapm_routes = ARRAY_SIZE(uda1380_dapm_routes), .num_dapm_routes = ARRAY_SIZE(uda1380_dapm_routes),
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
static int uda1380_i2c_probe(struct i2c_client *i2c, static int uda1380_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -840,7 +840,7 @@ static struct i2c_driver uda1380_i2c_driver = { ...@@ -840,7 +840,7 @@ static struct i2c_driver uda1380_i2c_driver = {
static int __init uda1380_modinit(void) static int __init uda1380_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(&uda1380_i2c_driver); ret = i2c_add_driver(&uda1380_i2c_driver);
if (ret != 0) if (ret != 0)
pr_err("Failed to register UDA1380 I2C driver: %d\n", ret); pr_err("Failed to register UDA1380 I2C driver: %d\n", ret);
...@@ -851,7 +851,7 @@ module_init(uda1380_modinit); ...@@ -851,7 +851,7 @@ module_init(uda1380_modinit);
static void __exit uda1380_exit(void) static void __exit uda1380_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&uda1380_i2c_driver); i2c_del_driver(&uda1380_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