ASoC: DAPM: fix build errors for missing snd_soc_dapm_new_control symbol
diff mbox

Message ID 1434386871-24325-1-git-send-email-liam.r.girdwood@linux.intel.com
State New
Headers show

Commit Message

Liam Girdwood June 15, 2015, 4:47 p.m. UTC
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 <liam.r.girdwood@linux.intel.com>
---
 sound/soc/soc-dapm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Mark Brown June 15, 2015, 4:57 p.m. UTC | #1
On Mon, Jun 15, 2015 at 05:47:51PM +0100, Liam Girdwood wrote:
> 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 <liam.r.girdwood@linux.intel.com>

This doesn't apply, I appear to have this already?
Liam Girdwood June 15, 2015, 5:10 p.m. UTC | #2
On Mon, 2015-06-15 at 17:57 +0100, Mark Brown wrote:
> On Mon, Jun 15, 2015 at 05:47:51PM +0100, Liam Girdwood wrote:
> > 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 <liam.r.girdwood@linux.intel.com>
> 
> This doesn't apply, I appear to have this already?

Oh, ok - Vinod reported it was missing earlier and I could not see it in
your topic/topology either ?

Liam
Mark Brown June 15, 2015, 6:20 p.m. UTC | #3
On Mon, Jun 15, 2015 at 06:10:33PM +0100, Liam Girdwood wrote:
> On Mon, 2015-06-15 at 17:57 +0100, Mark Brown wrote:

> > This doesn't apply, I appear to have this already?

> Oh, ok - Vinod reported it was missing earlier and I could not see it in
> your topic/topology either ?

It's a change for DAPM, it's on the DAPM branch.
Vinod Koul June 16, 2015, 3:47 a.m. UTC | #4
On Mon, Jun 15, 2015 at 07:20:22PM +0100, Mark Brown wrote:
> On Mon, Jun 15, 2015 at 06:10:33PM +0100, Liam Girdwood wrote:
> > On Mon, 2015-06-15 at 17:57 +0100, Mark Brown wrote:
> 
> > > This doesn't apply, I appear to have this already?
> 
> > Oh, ok - Vinod reported it was missing earlier and I could not see it in
> > your topic/topology either ?
> 
> It's a change for DAPM, it's on the DAPM branch.
Sorry for the noise, let me cherry-pick that one for testing.

Patch
diff mbox

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)
 {