aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Fabio Estevam <fabio.estevam@freescale.com> 2013-11-20 15:37:47 -0200
committerGravatar Mark Brown <broonie@linaro.org> 2013-11-24 13:49:44 +0000
commit5c1537163ce716e317776565b8210ea06fa2b5de (patch)
treef1408f5e270911131f2250d8509ed7e6e2de2fb2
parentLinux 3.13-rc1 (diff)
downloadlinux-5c1537163ce716e317776565b8210ea06fa2b5de.tar.gz
linux-5c1537163ce716e317776565b8210ea06fa2b5de.tar.bz2
linux-5c1537163ce716e317776565b8210ea06fa2b5de.zip
ASoC: wm8728: 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/wm8728.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/codecs/wm8728.c b/sound/soc/codecs/wm8728.c
index c6a292dcded0..cd89033e84c0 100644
--- a/sound/soc/codecs/wm8728.c
+++ b/sound/soc/codecs/wm8728.c
@@ -320,7 +320,7 @@ static struct spi_driver wm8728_spi_driver = {
};
#endif /* CONFIG_SPI_MASTER */
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
static int wm8728_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id)
{
@@ -371,7 +371,7 @@ static struct i2c_driver wm8728_i2c_driver = {
static int __init wm8728_modinit(void)
{
int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
ret = i2c_add_driver(&wm8728_i2c_driver);
if (ret != 0) {
printk(KERN_ERR "Failed to register wm8728 I2C driver: %d\n",
@@ -391,7 +391,7 @@ module_init(wm8728_modinit);
static void __exit wm8728_exit(void)
{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&wm8728_i2c_driver);
#endif
#if defined(CONFIG_SPI_MASTER)