diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2013-11-21 09:38:44 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-27 13:14:29 -0500 |
commit | 1037d567fdfc7ab9d3e2328e27bdc1300d3fdb1e (patch) | |
tree | f8268f698b536bcd997d13b3fec94737d555375a /sound/soc/codecs/wm8737.c | |
parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) |
ASoC: wm8737: Use IS_ENABLED() macro
Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/codecs/wm8737.c')
-rw-r--r-- | sound/soc/codecs/wm8737.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8737.c b/sound/soc/codecs/wm8737.c index 2f167a8ca01b..22de2420bec8 100644 --- a/sound/soc/codecs/wm8737.c +++ b/sound/soc/codecs/wm8737.c | |||
@@ -644,7 +644,7 @@ static const struct regmap_config wm8737_regmap = { | |||
644 | .volatile_reg = wm8737_volatile, | 644 | .volatile_reg = wm8737_volatile, |
645 | }; | 645 | }; |
646 | 646 | ||
647 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 647 | #if IS_ENABLED(CONFIG_I2C) |
648 | static int wm8737_i2c_probe(struct i2c_client *i2c, | 648 | static int wm8737_i2c_probe(struct i2c_client *i2c, |
649 | const struct i2c_device_id *id) | 649 | const struct i2c_device_id *id) |
650 | { | 650 | { |
@@ -758,7 +758,7 @@ static struct spi_driver wm8737_spi_driver = { | |||
758 | static int __init wm8737_modinit(void) | 758 | static int __init wm8737_modinit(void) |
759 | { | 759 | { |
760 | int ret; | 760 | int ret; |
761 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 761 | #if IS_ENABLED(CONFIG_I2C) |
762 | ret = i2c_add_driver(&wm8737_i2c_driver); | 762 | ret = i2c_add_driver(&wm8737_i2c_driver); |
763 | if (ret != 0) { | 763 | if (ret != 0) { |
764 | printk(KERN_ERR "Failed to register WM8737 I2C driver: %d\n", | 764 | printk(KERN_ERR "Failed to register WM8737 I2C driver: %d\n", |
@@ -781,7 +781,7 @@ static void __exit wm8737_exit(void) | |||
781 | #if defined(CONFIG_SPI_MASTER) | 781 | #if defined(CONFIG_SPI_MASTER) |
782 | spi_unregister_driver(&wm8737_spi_driver); | 782 | spi_unregister_driver(&wm8737_spi_driver); |
783 | #endif | 783 | #endif |
784 | #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) | 784 | #if IS_ENABLED(CONFIG_I2C) |
785 | i2c_del_driver(&wm8737_i2c_driver); | 785 | i2c_del_driver(&wm8737_i2c_driver); |
786 | #endif | 786 | #endif |
787 | } | 787 | } |