alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Fabio Estevam <fabio.estevam@freescale.com>
To: broonie@kernel.org
Cc: Fabio Estevam <fabio.estevam@freescale.com>, alsa-devel@alsa-project.org
Subject: [PATCH 03/18] ASoC: da7210: Use IS_ENABLED() macro
Date: Thu, 21 Nov 2013 12:38:40 -0200	[thread overview]
Message-ID: <1385044736-14911-4-git-send-email-fabio.estevam@freescale.com> (raw)
In-Reply-To: <1385044736-14911-1-git-send-email-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/da7210.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c
index 9c12314..8166dcb 100644
--- a/sound/soc/codecs/da7210.c
+++ b/sound/soc/codecs/da7210.c
@@ -1188,7 +1188,7 @@ static struct snd_soc_codec_driver soc_codec_dev_da7210 = {
 	.num_dapm_routes	= ARRAY_SIZE(da7210_audio_map),
 };
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 
 static struct reg_default da7210_regmap_i2c_patch[] = {
 
@@ -1362,7 +1362,7 @@ static struct spi_driver da7210_spi_driver = {
 static int __init da7210_modinit(void)
 {
 	int ret = 0;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	ret = i2c_add_driver(&da7210_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)
@@ -1378,7 +1378,7 @@ module_init(da7210_modinit);
 
 static void __exit da7210_exit(void)
 {
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+#if IS_ENABLED(CONFIG_I2C)
 	i2c_del_driver(&da7210_i2c_driver);
 #endif
 #if defined(CONFIG_SPI_MASTER)
-- 
1.8.1.2

  parent reply	other threads:[~2013-11-21 14:39 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-21 14:38 [PATCH 00/18] ASoC: codecs: Use IS_ENABLED() macro Fabio Estevam
2013-11-21 14:38 ` [PATCH 01/18] ASoC: cs4271: " Fabio Estevam
2013-11-27 18:12   ` Mark Brown
2013-11-21 14:38 ` [PATCH 02/18] ASoC: cs42l52: " Fabio Estevam
2013-11-27 18:11   ` Mark Brown
2013-11-21 14:38 ` Fabio Estevam [this message]
2013-11-21 14:38 ` [PATCH 03/18] ASoC: da7210: " Fabio Estevam
2013-11-21 14:38 ` [PATCH 04/18] ASoC: ssm2602: " Fabio Estevam
2013-11-27 18:13   ` Mark Brown
2013-11-21 14:38 ` [PATCH 05/18] ASoC: wm8731: " Fabio Estevam
2013-11-27 18:14   ` Mark Brown
2013-11-21 14:38 ` [PATCH 06/18] ASoC: wm8737: " Fabio Estevam
2013-11-27 18:14   ` Mark Brown
2013-11-21 14:38 ` [PATCH 07/18] ASoC:: wm8741: " Fabio Estevam
2013-11-27 18:15   ` Mark Brown
2013-11-21 14:38 ` [PATCH 08/18] ASoC:: wm8750: " Fabio Estevam
2013-11-27 18:15   ` Mark Brown
2013-11-21 14:38 ` [PATCH 09/18] ASoC: wm8753: " Fabio Estevam
2013-11-27 18:16   ` Mark Brown
2013-11-21 14:38 ` [PATCH 10/18] ASoC: wm8776: " Fabio Estevam
2013-11-21 14:38 ` [PATCH 11/18] ASoC: wm8804: " Fabio Estevam
2013-11-21 14:38 ` [PATCH 12/18] ASoC: wm8900: " Fabio Estevam
2013-11-27 18:19   ` Mark Brown
2013-11-21 14:38 ` [PATCH 13/18] ASoC: wm8983: " Fabio Estevam
2013-11-27 18:20   ` Mark Brown
2013-11-21 14:38 ` [PATCH 14/18] ASoC: wm8985: " Fabio Estevam
2013-11-27 18:20   ` Mark Brown
2013-11-21 14:38 ` [PATCH 15/18] ASoC: wm8988: " Fabio Estevam
2013-11-27 18:21   ` Mark Brown
2013-11-21 14:38 ` [PATCH 16/18] ASoC: wm8990: Fabio Estevam
2013-11-21 14:49   ` Mark Brown
2013-11-21 14:50     ` Fabio Estevam
2013-11-21 18:38       ` Mark Brown
2013-11-21 14:38 ` [PATCH 17/18] ASoC: wm8995: Fabio Estevam
2013-11-21 14:38 ` [PATCH 18/18] AsoC: wm9081: Fabio Estevam

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=1385044736-14911-4-git-send-email-fabio.estevam@freescale.com \
    --to=fabio.estevam@freescale.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    /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).