[PATCH] ALSA: ASoC: Fix SmartQ compilation

[PATCH] ALSA: ASoC: Fix SmartQ compilation

[Maurus Cuelenaere]

This makes the SmartQ sound driver compile again with recent ASoC changes.

Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
---
 sound/soc/s3c24xx/smartq_wm8987.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/sound/soc/s3c24xx/smartq_wm8987.c b/sound/soc/s3c24xx/smartq_wm8987.c
index dd20ca7..aef94c7 100644
--- a/sound/soc/s3c24xx/smartq_wm8987.c
+++ b/sound/soc/s3c24xx/smartq_wm8987.c
@@ -39,8 +39,8 @@ static int smartq_hifi_hw_params(struct snd_pcm_substream *substream,
 	struct snd_pcm_hw_params *params)
 {
 	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
-	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
+	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
 	struct s3c_i2sv2_rate_calc div;
 	unsigned int clk = 0;
 	int ret;
@@ -156,8 +156,9 @@ static const struct snd_soc_dapm_route audio_map[] = {
 	{"LINPUT2", NULL, "Mic Bias"},
 };
 
-static int smartq_wm8987_init(struct snd_soc_codec *codec)
+static int smartq_wm8987_init(struct snd_soc_pcm_runtime *rtd)
 {
+	struct snd_soc_codec *codec = rtd->codec;
 	int err = 0;
 
 	/* Add SmartQ specific widgets */
@@ -190,8 +191,8 @@ static int smartq_wm8987_init(struct snd_soc_codec *codec)
 		return err;
 
 	/* Headphone jack detection */
-	err = snd_soc_jack_new(&snd_soc_smartq, "Headphone Jack",
-			       SND_JACK_HEADPHONE, &smartq_jack);
+	err = snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
+			       &smartq_jack);
 	if (err)
 		return err;
 
-- 
1.7.1

Re: [PATCH] ALSA: ASoC: Fix SmartQ compilation

[Jassi Brar]

On Mon, Jan 3, 2011 at 4:48 AM, Maurus Cuelenaere <mcuelenaere@gmail.com> wrote:
> This makes the SmartQ sound driver compile again with recent ASoC changes.
>
> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
> ---
>  sound/soc/s3c24xx/smartq_wm8987.c |   11 ++++++-----

But we have moved to sound/soc/samsung/ now.

Thanks
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

Re: [PATCH] ALSA: ASoC: Fix SmartQ compilation

[Liam Girdwood]

On Sun, 2011-01-02 at 20:48 +0100, Maurus Cuelenaere wrote:
> This makes the SmartQ sound driver compile again with recent ASoC changes.
> 
> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>
> ---
>  sound/soc/s3c24xx/smartq_wm8987.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 

Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
-- 
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk

Re: [PATCH] ALSA: ASoC: Fix SmartQ compilation

[Mark Brown]

On Sun, Jan 02, 2011 at 08:48:23PM +0100, Maurus Cuelenaere wrote:
> This makes the SmartQ sound driver compile again with recent ASoC changes.
> 
> Signed-off-by: Maurus Cuelenaere <mcuelenaere@gmail.com>

As Jassi said this doesn't apply against -next.  I've applied for 2.6.37
and done a merge but I may have resolved some stuff incorrectly so
please check.

Re: [PATCH] ALSA: ASoC: Fix SmartQ compilation

[Maurus Cuelenaere]

Op 05-01-11 11:04, Mark Brown schreef:
> On Sun, Jan 02, 2011 at 08:48:23PM +0100, Maurus Cuelenaere wrote:
>> This makes the SmartQ sound driver compile again with recent ASoC changes.
>>
>> Signed-off-by: Maurus Cuelenaere<mcuelenaere@gmail.com>
> As Jassi said this doesn't apply against -next.  I've applied for 2.6.37
> and done a merge but I may have resolved some stuff incorrectly so
> please check.

Hmm, looks like 74bd21e9b301445b57bdcccdd7b5063ad3fbad0f is pretty much the same, so that obsoletes my patch.

Sorry for not checking linux-next.

-- 
Maurus Cuelenaere