diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-20 10:20:14 +0100 |
| commit | 258753361534a40ad7180c742da813fc659e427b (patch) | |
| tree | 58517f6ce46ab2c897d427b7d1bf29850be314fa /sound/soc/codecs/wm8741.c | |
| parent | 315fba80a664e4bd928e0b85a38d26e60645b96a (diff) | |
| parent | 2aff4c9ce898b9079658650c1ab33c44b100a203 (diff) | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/wm8741.c')
| -rw-r--r-- | sound/soc/codecs/wm8741.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c index b18813cc7ba..2895c8d3b5e 100644 --- a/sound/soc/codecs/wm8741.c +++ b/sound/soc/codecs/wm8741.c @@ -500,7 +500,7 @@ static const struct regmap_config wm8741_regmap = { .readable_reg = wm8741_readable, }; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) static int wm8741_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) { @@ -617,7 +617,7 @@ static int __init wm8741_modinit(void) { int ret = 0; -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) ret = i2c_add_driver(&wm8741_i2c_driver); if (ret != 0) pr_err("Failed to register WM8741 I2C driver: %d\n", ret); @@ -639,7 +639,7 @@ static void __exit wm8741_exit(void) #if defined(CONFIG_SPI_MASTER) spi_unregister_driver(&wm8741_spi_driver); #endif -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if IS_ENABLED(CONFIG_I2C) i2c_del_driver(&wm8741_i2c_driver); #endif } |