From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 11 Aug 2011 17:59:11 +0000 (-0600)
Subject: ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~942
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=81bca7624db4720db686fa38435c39ea95b7be8f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ASoC: soc-io: Fix CONFIG_REGMAP_I2C/SPI guards to support regmap modules

When CONFIG_REGMAP_I2C/SPI are m, CONFIG_REGMAP_I2C_MODULE is set in the
pre-processor instead of CONFIG_REGMAP_I2C. This removes SND_SOC_I2C as a
valid option for snd_soc_codec_set_cache_io()'s control parameter, and
causes any ASoC regmap-using codec built as a module to fail to initialize.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

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