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

ASoC: wm8804: 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
...@@ -739,7 +739,7 @@ static struct spi_driver wm8804_spi_driver = { ...@@ -739,7 +739,7 @@ static struct spi_driver wm8804_spi_driver = {
}; };
#endif #endif
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
static int wm8804_i2c_probe(struct i2c_client *i2c, static int wm8804_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -791,7 +791,7 @@ static int __init wm8804_modinit(void) ...@@ -791,7 +791,7 @@ static int __init wm8804_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(&wm8804_i2c_driver); ret = i2c_add_driver(&wm8804_i2c_driver);
if (ret) { if (ret) {
printk(KERN_ERR "Failed to register wm8804 I2C driver: %d\n", printk(KERN_ERR "Failed to register wm8804 I2C driver: %d\n",
...@@ -811,7 +811,7 @@ module_init(wm8804_modinit); ...@@ -811,7 +811,7 @@ module_init(wm8804_modinit);
static void __exit wm8804_exit(void) static void __exit wm8804_exit(void)
{ {
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&wm8804_i2c_driver); i2c_del_driver(&wm8804_i2c_driver);
#endif #endif
#if defined(CONFIG_SPI_MASTER) #if defined(CONFIG_SPI_MASTER)
......
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