* [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub
@ 2014-05-27 15:46 Arnd Bergmann
2014-05-27 15:50 ` Mark Brown
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2014-05-27 15:46 UTC (permalink / raw)
To: alsa-devel; +Cc: broonie, Jarkko Nikula, Liam Girdwood
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@arndb.de>
Cc: Jarkko Nikula <jarkko.nikula@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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub
2014-05-27 15:46 [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub Arnd Bergmann
@ 2014-05-27 15:50 ` Mark Brown
2014-05-27 15:52 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2014-05-27 15:50 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: alsa-devel, Jarkko Nikula, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 416 bytes --]
On Tue, May 27, 2014 at 05:46:05PM +0200, Arnd Bergmann wrote:
> 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.
I've already applied a fix for this from Jarkko.
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub
2014-05-27 15:50 ` Mark Brown
@ 2014-05-27 15:52 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2014-05-27 15:52 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, Jarkko Nikula, Liam Girdwood
On Tuesday 27 May 2014 16:50:44 Mark Brown wrote:
> On Tue, May 27, 2014 at 05:46:05PM +0200, Arnd Bergmann wrote:
> > 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.
>
> I've already applied a fix for this from Jarkko.
Ok, cool. I should probably at some point subscribe to alsa-devel
so I can check better if someone posted a patch for a bug I find.
I did a google search but didn't find anything on this.
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-27 15:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-27 15:46 [PATCH] ASoC: fix snd_soc_jack_add_gpiods stub Arnd Bergmann
2014-05-27 15:50 ` Mark Brown
2014-05-27 15:52 ` Arnd Bergmann
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.