From: Fabio Estevam <festevam@gmail.com>
To: broonie@kernel.org
Cc: Fabio Estevam <fabio.estevam@freescale.com>, alsa-devel@alsa-project.org
Subject: [PATCH 04/11] adav80x: Use IS_ENABLED() macro
Date: Wed, 20 Nov 2013 15:37:44 -0200 [thread overview]
Message-ID: <1384969072-25906-5-git-send-email-festevam@gmail.com> (raw)
In-Reply-To: <1384969072-25906-1-git-send-email-festevam@gmail.com>
From: Fabio Estevam <fabio.estevam@freescale.com>
Using the IS_ENABLED() macro can make the code shorter and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
sound/soc/codecs/adav80x.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/sound/soc/codecs/adav80x.c b/sound/soc/codecs/adav80x.c
index 14a7c16..f7bf455 100644
--- a/sound/soc/codecs/adav80x.c
+++ b/sound/soc/codecs/adav80x.c
@@ -939,7 +939,7 @@ static struct spi_driver adav80x_spi_driver = {
};
#endif
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
static const struct regmap_config adav80x_i2c_regmap_config = {
.val_bits = 8,
.pad_bits = 1,
@@ -985,7 +985,7 @@ static int __init adav80x_init(void)
{
int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
ret = i2c_add_driver(&adav80x_i2c_driver);
if (ret)
return ret;
@@ -1001,7 +1001,7 @@ module_init(adav80x_init);
static void __exit adav80x_exit(void)
{
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&adav80x_i2c_driver);
#endif
#if defined(CONFIG_SPI_MASTER)
--
1.8.1.2
next prev parent reply other threads:[~2013-11-20 17:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-20 17:37 [PATCH 00/11] codecs: Use IS_ENABLED() macro Fabio Estevam
2013-11-20 17:37 ` [PATCH 01/11] wm8962: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 02/11] soc-io.c: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 03/11] ad193x: " Fabio Estevam
2013-11-29 7:24 ` Scott Jiang
2013-11-20 17:37 ` Fabio Estevam [this message]
2013-11-20 17:37 ` [PATCH 04/11] adav80x: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 05/11] ak4642: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 06/11] wm8728: " Fabio Estevam
2013-11-21 13:09 ` Mark Brown
2013-11-20 17:37 ` [PATCH 07/11] wm8711: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 08/11] wm8580: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 09/11] wm8523: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 10/11] wm8510: " Fabio Estevam
2013-11-20 17:37 ` [PATCH 11/11] uda1380: " Fabio Estevam
2013-11-21 13:35 ` [PATCH 00/11] codecs: " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1384969072-25906-5-git-send-email-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=fabio.estevam@freescale.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).