Subject: Re: linux-next: build failure after merge of the sound-asoc tree

From: Liam Girdwood <[email-masked]>
Date: Mon, 06 Feb 2012 16:50:58 +0000

Hi Stephen,

Btw, I have a new email address at TI now, any chance you could update
your scripts. Thanks !

On Mon, 2012-02-06 at 12:25 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the sound-asoc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> sound/soc/codecs/max9768.c: In function 'max9768_probe':
> sound/soc/codecs/max9768.c:138:3: error: implicit declaration of function 'snd_soc_add_controls' [-Werror=implicit-function-declaration]
> 
> Caused by commit 022658beab55 ("ASoC: core: Add support for DAI and
> machine kcontrols").
> 
> I have used the sound-asoc tree from next-20120203 for today.

Sorry, this should fix it.

>>From e3e06e913cb74a57b603a2e7ac0f08c995af4969 Mon Sep 17 00:00:00 2001
From: Liam Girdwood <[email-masked]>
Date: Mon, 6 Feb 2012 16:36:04 +0000
Subject: [PATCH] ASoC: max9768 - Fix build and use new add control API.

Fix build breakage by using the correct API call to add kcontrols.

Signed-off-by: Liam Girdwood <[email-masked]>
---
 sound/soc/codecs/max9768.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/codecs/max9768.c b/sound/soc/codecs/max9768.c
index 79e9901..17b3ec2 100644
--- a/sound/soc/codecs/max9768.c
+++ b/sound/soc/codecs/max9768.c
@@ -135,7 +135,7 @@ static int max9768_probe(struct snd_soc_codec *codec)
 	}
 
 	if (gpio_is_valid(max9768->mute_gpio)) {
-		ret = snd_soc_add_controls(codec, max9768_mute,
+		ret = snd_soc_add_codec_controls(codec, max9768_mute,
 				ARRAY_SIZE(max9768_mute));
 		if (ret)
 			return ret;
-- 
1.7.5.4