[alsa-devel] [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available

Vasily Khoruzhick anarsoul at gmail.com
Fri Aug 12 16:52:58 CEST 2011


Otherwise we get linker error like:
ERROR: "regmap_init_spi" [sound/soc/snd-soc-core.ko] undefined!

Signed-off-by: Vasily Khoruzhick <anarsoul at gmail.com>
---
 sound/soc/soc-io.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index e471ed6..c1565e4 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -122,16 +122,18 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	config.val_bits = data_bits;
 
 	switch (control) {
+#ifdef CONFIG_REGMAP_I2C
 	case SND_SOC_I2C:
 		codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
 						      &config);
 		break;
-
+#endif
+#ifdef CONFIG_REGMAP_SPI
 	case SND_SOC_SPI:
 		codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
 						      &config);
 		break;
-
+#endif
 	case SND_SOC_REGMAP:
 		/* Device has made its own regmap arrangements */
 		break;
-- 
1.7.5.rc3



More information about the Alsa-devel mailing list