Merge remote-tracking branches 'asoc/topic/wm8961', 'asoc/topic/wm8962', 'asoc/topic...

[mirror_ubuntu-zesty-kernel.git] / sound / soc / codecs / wm8983.c

diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index 770e5a7058518e32c189e8d83a671170cdbcbc8a..58f0551eed2d9f50df910dd8f703f39308fa7fca 100644 (file)
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -1124,7 +1124,7 @@ static struct spi_driver wm8983_spi_driver = {
 };
 #endif
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 static int wm8983_i2c_probe(struct i2c_client *i2c,
                            const struct i2c_device_id *id)
 {
@@ -1177,7 +1177,7 @@ static int __init wm8983_modinit(void)
 {
        int ret = 0;
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
        ret = i2c_add_driver(&wm8983_i2c_driver);
        if (ret) {
                printk(KERN_ERR "Failed to register wm8983 I2C driver: %d\n",
@@ -1197,7 +1197,7 @@ module_init(wm8983_modinit);
 
 static void __exit wm8983_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
        i2c_del_driver(&wm8983_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)