Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available
@ 2011-08-12 14:52 Vasily Khoruzhick
  2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Vasily Khoruzhick @ 2011-08-12 14:52 UTC (permalink / raw)
  To: Liam Girdwood, Mark Brown, alsa-devel, Jassi Brar; +Cc: Vasily Khoruzhick

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

Signed-off-by: Vasily Khoruzhick <anarsoul@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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-14 10:23 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-12 14:52 [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Vasily Khoruzhick
2011-08-12 14:52 ` [PATCH 2/3] ASoC: h1940: Fix compilation error due to missing header Vasily Khoruzhick
2011-08-13  7:07   ` Jassi Brar
2011-08-14 10:23     ` Mark Brown
2011-08-12 14:53 ` [PATCH 3/3] ASoC: rx1950: " Vasily Khoruzhick
2011-08-12 14:59 ` [PATCH 1/3] soc/soc-io.c: Use regmap_init_{i2c, spi} only if it's available Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox