alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Fabio Estevam <festevam@gmail.com>
To: broonie@kernel.org
Cc: Fabio Estevam <fabio.estevam@freescale.com>, alsa-devel@alsa-project.org
Subject: [PATCH 02/11] soc-io.c: Use IS_ENABLED() macro
Date: Wed, 20 Nov 2013 15:37:42 -0200	[thread overview]
Message-ID: <1384969072-25906-3-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/soc-io.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 4f11d23..aa886cc 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -99,14 +99,14 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	config.val_bits = data_bits;
 
 	switch (control) {
-#if defined(CONFIG_REGMAP_I2C) || defined(CONFIG_REGMAP_I2C_MODULE)
+#if IS_ENABLED(CONFIG_REGMAP_I2C)
 	case SND_SOC_I2C:
 		codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
 						      &config);
 		break;
 #endif
 
-#if defined(CONFIG_REGMAP_SPI) || defined(CONFIG_REGMAP_SPI_MODULE)
+#if IS_ENABLED(CONFIG_REGMAP_SPI)
 	case SND_SOC_SPI:
 		codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
 						      &config);
-- 
1.8.1.2

  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 ` Fabio Estevam [this message]
2013-11-20 17:37 ` [PATCH 03/11] ad193x: " Fabio Estevam
2013-11-29  7:24   ` Scott Jiang
2013-11-20 17:37 ` [PATCH 04/11] adav80x: " Fabio Estevam
2013-11-20 17:37 ` 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-3-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).