[alsa-devel] [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub

Arnd Bergmann arnd at arndb.de
Tue May 27 17:46:05 CEST 2014


f025d3b9c64e1 ("ASoC: jack: Add support for GPIO descriptor defined jack
pins") added this new interface, but the stub function provided for
non-gpiolib builds was defined in the header file as a global function,
leading to lots of "multiple definition of `snd_soc_jack_add_gpiods'"
warnings.

This adds the obvious "static inline" annotation.

Signed-off-by: Arnd Bergmann <arnd at arndb.de>
Cc: Jarkko Nikula <jarkko.nikula at linux.intel.com>

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 98dca42..559dc53 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -464,9 +464,9 @@ static inline int snd_soc_jack_add_gpios(struct snd_soc_jack *jack, int count,
 	return 0;
 }
 
-int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
-			    struct snd_soc_jack *jack,
-			    int count, struct snd_soc_jack_gpio *gpios)
+static inline int snd_soc_jack_add_gpiods(struct device *gpiod_dev,
+					  struct snd_soc_jack *jack,
+					  int count, struct snd_soc_jack_gpio *gpios)
 {
 	return 0;
 }



More information about the Alsa-devel mailing list