[PATCH 0/2] ASoc: ac97: fix multi-platform build failures

[PATCH 0/2] ASoc: ac97: fix multi-platform build failures

[Kevin Hilman]

Hi Mark,

When building next-20130628, I noticed a few build errors for
cm_x300_defconfig that were introduced by the new multi-platform AC'97
support.

Here's a couple fixup patches, that should maybe just be folded into
the originals, assuming they're the correct fixes.  At least it things
build again for 

Kevin


Kevin Hilman (2):
  ASoC: ac97: pxa2xx: fixup multi-platform AC'97 build failures
  ASoC: ac97: fixup multi-platform AC'97 module build failure

 sound/soc/pxa/pxa2xx-ac97.c | 2 ++
 sound/soc/pxa/pxa2xx-ac97.h | 3 ---
 sound/soc/soc-core.c        | 1 +
 3 files changed, 3 insertions(+), 3 deletions(-)

-- 
1.8.3

[PATCH 1/2] ASoC: ac97: pxa2xx: fixup multi-platform AC'97 build failures

[Kevin Hilman]

commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced
some build failures for the pxa2xx-ac97 support, fix them.

Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
 sound/soc/pxa/pxa2xx-ac97.c | 2 ++
 sound/soc/pxa/pxa2xx-ac97.h | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index a3c22ba..1475515 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -238,6 +238,8 @@ static const struct snd_soc_component_driver pxa_ac97_component = {
 
 static int pxa2xx_ac97_dev_probe(struct platform_device *pdev)
 {
+	int ret;
+
 	if (pdev->id != -1) {
 		dev_err(&pdev->dev, "PXA2xx has only one AC97 port.\n");
 		return -ENXIO;
diff --git a/sound/soc/pxa/pxa2xx-ac97.h b/sound/soc/pxa/pxa2xx-ac97.h
index eda891e..a49c21b 100644
--- a/sound/soc/pxa/pxa2xx-ac97.h
+++ b/sound/soc/pxa/pxa2xx-ac97.h
@@ -14,7 +14,4 @@
 #define PXA2XX_DAI_AC97_AUX		1
 #define PXA2XX_DAI_AC97_MIC		2
 
-/* platform data */
-extern struct snd_ac97_bus_ops pxa2xx_ac97_ops;
-
 #endif
-- 
1.8.3

[PATCH 2/2] ASoC: ac97: fixup multi-platform AC'97 module build failure

[Kevin Hilman]

commit b047e1cc (ASoC: ac97: Support multi-platform AC'97) introduced
some build failures for modules wanting to access the generic
soc_ac97_ops.  For example:

ERROR: "soc_ac97_ops" [sound/soc/codecs/snd-soc-wm9712.ko] undefined!

To fix, export soc_ac97_ops to modules.

Cc: Mark Brown <broonie@linaro.org>
Signed-off-by: Kevin Hilman <khilman@linaro.org>
---
 sound/soc/soc-core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 309e5c9..0ec070c 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2081,6 +2081,7 @@ int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
 EXPORT_SYMBOL_GPL(snd_soc_new_ac97_codec);
 
 struct snd_ac97_bus_ops *soc_ac97_ops;
+EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
 int snd_soc_set_ac97_ops(struct snd_ac97_bus_ops *ops)
 {
-- 
1.8.3

[PATCH 0/2] ASoc: ac97: fix multi-platform build failures

[Mark Brown]

On Fri, Jun 28, 2013 at 11:17:47AM -0700, Kevin Hilman wrote:
> Hi Mark,
> 
> When building next-20130628, I noticed a few build errors for
> cm_x300_defconfig that were introduced by the new multi-platform AC'97
> support.

Applied both, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130629/1d926f2b/attachment.sig>