ASoC: Disable regmap helpers if regmap is disabled

Commit Message

Lars-Peter Clausen Nov. 25, 2014, 8:41 p.m. UTC

If regmap is disabled there will be no users of the ASoC regmap helpers.
Furthermore regmap_exit() will no be defined causing the following compile
error:
	sound/soc/soc-core.c: In function 'snd_soc_component_exit_regmap':
	sound/soc/soc-core.c:2645:2: error: implicit declaration of function
		'regmap_exit' [-Werror=implicit-function-declaration]

So disable the helpers if regmap is disabled.

Reported-by: kbuild test robot <[e-mail]>
Fixes: 20feb881988c ASoC: Add helper functions for deferred regmap setup")
Signed-off-by: Lars-Peter Clausen <[e-mail]>
---
 include/sound/soc.h  | 4 ++++
 sound/soc/soc-core.c | 4 ++++
 2 files changed, 8 insertions(+)

Comments

Mark Brown Nov. 25, 2014, 9:15 p.m. UTC | #1

On Tue, Nov 25, 2014 at 09:41:03PM +0100, Lars-Peter Clausen wrote:
> If regmap is disabled there will be no users of the ASoC regmap helpers.
> Furthermore regmap_exit() will no be defined causing the following compile

Applied, thaks.

Patch

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 879e2b3..4cef90cc 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1283,6 +1283,8 @@  void snd_soc_component_async_complete(struct snd_soc_component *component);
 int snd_soc_component_test_bits(struct snd_soc_component *component,
 	unsigned int reg, unsigned int mask, unsigned int value);
 
+#ifdef CONFIG_REGMAP
+
 void snd_soc_component_init_regmap(struct snd_soc_component *component,
 	struct regmap *regmap);
 void snd_soc_component_exit_regmap(struct snd_soc_component *component);
@@ -1318,6 +1320,8 @@  static inline void snd_soc_codec_exit_regmap(struct snd_soc_codec *codec)
 	snd_soc_component_exit_regmap(&codec->component);
 }
 
+#endif
+
 /* device driver data */
 
 static inline void snd_soc_card_set_drvdata(struct snd_soc_card *card,
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index cc52ea1..7904eda 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2612,6 +2612,8 @@  static void snd_soc_component_setup_regmap(struct snd_soc_component *component)
 		component->val_bytes = val_bytes;
 }
 
+#ifdef CONFIG_REGMAP
+
 /**
  * snd_soc_component_init_regmap() - Initialize regmap instance for the component
  * @component: The component for which to initialize the regmap instance
@@ -2647,6 +2649,8 @@  void snd_soc_component_exit_regmap(struct snd_soc_component *component)
 }
 EXPORT_SYMBOL_GPL(snd_soc_component_exit_regmap);
 
+#endif
+
 static void snd_soc_component_add_unlocked(struct snd_soc_component *component)
 {
 	if (!component->write && !component->read) {