[asoc:topic/topology,104/105] :undefined reference to `snd_soc_dapm_new_control'

Commit Message

Liam Girdwood June 4, 2015, 2:13 p.m. UTC

On Thu, 2015-06-04 at 13:04 +0100, Mark Brown wrote:
> On Thu, Jun 04, 2015 at 06:58:38PM +0800, kbuild test robot wrote:
> 
> > All error/warnings (new ones prefixed by >>):
> > 
> >    sound/built-in.o: In function `soc_tplg_dapm_widget_create':
> > >> :(.text+0x25a90): undefined reference to `snd_soc_dapm_new_control'
> 
> The fix for the build bug in your patch exporting this was to add a
> static prototype (you were in the CC for that fix) so now the topology
> code still doesn't have the export.
> 
> Can you send a fixup please?

Sorry, appended below. I can resend separately if required.


From 3df449a45fcde9f63dd34683d4216a73bd900f98 Mon Sep 17 00:00:00 2001
From: Liam Girdwood <[e-mail]>
Date: Thu, 4 Jun 2015 15:08:34 +0100
Subject: [PATCH] ASoC: DAPM: fix build errors for missing
 snd_soc_dapm_new_control symbol

Fix the following error:-

All error/warnings (new ones prefixed by >>):
>
>    sound/built-in.o: In function `soc_tplg_dapm_widget_create':
> >> :(.text+0x25a90): undefined reference to `snd_soc_dapm_new_control'

Signed-off-by: Liam Girdwood <[e-mail]>
---
 sound/soc/soc-dapm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Vinod Koul June 15, 2015, 5:42 a.m. UTC | #1

On Thu, Jun 04, 2015 at 03:13:09PM +0100, Liam Girdwood wrote:
> On Thu, 2015-06-04 at 13:04 +0100, Mark Brown wrote:
> > On Thu, Jun 04, 2015 at 06:58:38PM +0800, kbuild test robot wrote:
> > 
> > > All error/warnings (new ones prefixed by >>):
> > > 
> > >    sound/built-in.o: In function `soc_tplg_dapm_widget_create':
> > > >> :(.text+0x25a90): undefined reference to `snd_soc_dapm_new_control'
> > 
> > The fix for the build bug in your patch exporting this was to add a
> > static prototype (you were in the CC for that fix) so now the topology
> > code still doesn't have the export.
> > 
> > Can you send a fixup please?
> 
> Sorry, appended below. I can resend separately if required.
I dont think Mark applied this, can you please resend

Liam Girdwood June 15, 2015, 4:46 p.m. UTC | #2

On Mon, 2015-06-15 at 11:12 +0530, Vinod Koul wrote:
> On Thu, Jun 04, 2015 at 03:13:09PM +0100, Liam Girdwood wrote:
> > On Thu, 2015-06-04 at 13:04 +0100, Mark Brown wrote:
> > > On Thu, Jun 04, 2015 at 06:58:38PM +0800, kbuild test robot wrote:
> > > 
> > > > All error/warnings (new ones prefixed by >>):
> > > > 
> > > >    sound/built-in.o: In function `soc_tplg_dapm_widget_create':
> > > > >> :(.text+0x25a90): undefined reference to `snd_soc_dapm_new_control'
> > > 
> > > The fix for the build bug in your patch exporting this was to add a
> > > static prototype (you were in the CC for that fix) so now the topology
> > > code still doesn't have the export.
> > > 
> > > Can you send a fixup please?
> > 
> > Sorry, appended below. I can resend separately if required.
> I dont think Mark applied this, can you please resend
> 

Resending.

Liam

Patch

diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 92d57a9..1b4a6eb 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -53,7 +53,7 @@  static int snd_soc_dapm_add_path(struct snd_soc_dapm_context *dapm,
 	int (*connected)(struct snd_soc_dapm_widget *source,
 			 struct snd_soc_dapm_widget *sink));
 
-static struct snd_soc_dapm_widget *
+struct snd_soc_dapm_widget *
 snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 			 const struct snd_soc_dapm_widget *widget);
 
@@ -3270,7 +3270,7 @@  int snd_soc_dapm_put_pin_switch(struct snd_kcontrol *kcontrol,
 }
 EXPORT_SYMBOL_GPL(snd_soc_dapm_put_pin_switch);
 
-static struct snd_soc_dapm_widget *
+struct snd_soc_dapm_widget *
 snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
 	const struct snd_soc_dapm_widget *widget)
 {