aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2013-11-21 09:38:51 -0500
committerMark Brown <broonie@linaro.org>2013-11-27 13:19:58 -0500
commit060ec80a27bf7a00bafb0c7495bbeec92e7903d3 (patch)
tree055bcd920696b712325b9033fbcf56c3fe9b3d53
parent6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff)
ASoC: wm8983: 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>
-rw-r--r--sound/soc/codecs/wm8983.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8983.c b/sound/soc/codecs/wm8983.c
index aa41ba0dfff4..3bae71d990e6 100644
--- a/sound/soc/codecs/wm8983.c
+++ b/sound/soc/codecs/wm8983.c
@@ -1129,7 +1129,7 @@ static struct spi_driver wm8983_spi_driver = {
1129}; 1129};
1130#endif 1130#endif
1131 1131
1132#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 1132#if IS_ENABLED(CONFIG_I2C)
1133static int wm8983_i2c_probe(struct i2c_client *i2c, 1133static int wm8983_i2c_probe(struct i2c_client *i2c,
1134 const struct i2c_device_id *id) 1134 const struct i2c_device_id *id)
1135{ 1135{
@@ -1182,7 +1182,7 @@ static int __init wm8983_modinit(void)
1182{ 1182{
1183 int ret = 0; 1183 int ret = 0;
1184 1184
1185#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 1185#if IS_ENABLED(CONFIG_I2C)
1186 ret = i2c_add_driver(&wm8983_i2c_driver); 1186 ret = i2c_add_driver(&wm8983_i2c_driver);
1187 if (ret) { 1187 if (ret) {
1188 printk(KERN_ERR "Failed to register wm8983 I2C driver: %d\n", 1188 printk(KERN_ERR "Failed to register wm8983 I2C driver: %d\n",
@@ -1202,7 +1202,7 @@ module_init(wm8983_modinit);
1202 1202
1203static void __exit wm8983_exit(void) 1203static void __exit wm8983_exit(void)
1204{ 1204{
1205#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) 1205#if IS_ENABLED(CONFIG_I2C)
1206 i2c_del_driver(&wm8983_i2c_driver); 1206 i2c_del_driver(&wm8983_i2c_driver);
1207#endif 1207#endif
1208#if defined(CONFIG_SPI_MASTER) 1208#if defined(CONFIG_SPI_MASTER)