Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e667487b authored by Jarkko Nikula's avatar Jarkko Nikula Committed by Mark Brown
Browse files

ASoC: jack: Fix multiple definition of `snd_soc_jack_add_gpiods' 



Commit f025d3b9 ("ASoC: jack: Add support for GPIO descriptor defined
jack pins") caused build error when CONFIG_GPIOLIB is not set:

sound/include/sound/soc.h:470: multiple definition of `snd_soc_jack_add_gpiods'
sound/soc/soc-core.o:sound/include/sound/soc.h:470: first defined here
make[2]: *** [sound/soc/snd-soc-core.o] Error 1
make[2]: *** Waiting for unfinished jobs....
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2

Fix this by marking snd_soc_jack_add_gpiods() as static inline in soc.h.

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarJarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 83ad152d

include/sound/soc.h

+4 −3
Original line number Diff line number Diff line
@@ -465,9 +465,10 @@ 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,

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)

					  int count,

					  struct snd_soc_jack_gpio *gpios)

{

	return 0;

}