]> git.karo-electronics.de Git - linux-beck.git/commitdiff
ASoC: spitz: Fix kcontrols to use card instead of codec
authorLiam Girdwood <lrg@ti.com>
Thu, 16 Feb 2012 12:00:23 +0000 (12:00 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 16 Feb 2012 16:24:40 +0000 (08:24 -0800)
Machine kcontrols now use card instead of codec for thier "chip".

Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/pxa/spitz.c

index 90c5245c4742493bc7406d27d5d7bf11d2a74423..4d108dc52e2e7351487310e20302f2a148352b0e 100644 (file)
@@ -44,9 +44,9 @@ static int spitz_jack_func;
 static int spitz_spk_func;
 static int spitz_mic_gpio;
 
-static void spitz_ext_control(struct snd_soc_codec *codec)
+static void spitz_ext_control(struct snd_soc_card *card)
 {
-       struct snd_soc_dapm_context *dapm = &codec->dapm;
+       struct snd_soc_dapm_context *dapm = &card->dapm;
 
        if (spitz_spk_func == SPITZ_SPK_ON)
                snd_soc_dapm_enable_pin(dapm, "Ext Spk");
@@ -173,13 +173,13 @@ static int spitz_get_jack(struct snd_kcontrol *kcontrol,
 static int spitz_set_jack(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol);
+       struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
 
        if (spitz_jack_func == ucontrol->value.integer.value[0])
                return 0;
 
        spitz_jack_func = ucontrol->value.integer.value[0];
-       spitz_ext_control(codec);
+       spitz_ext_control(card);
        return 1;
 }
 
@@ -193,13 +193,13 @@ static int spitz_get_spk(struct snd_kcontrol *kcontrol,
 static int spitz_set_spk(struct snd_kcontrol *kcontrol,
        struct snd_ctl_elem_value *ucontrol)
 {
-       struct snd_soc_codec *codec =  snd_kcontrol_chip(kcontrol);
+       struct snd_soc_card *card =  snd_kcontrol_chip(kcontrol);
 
        if (spitz_spk_func == ucontrol->value.integer.value[0])
                return 0;
 
        spitz_spk_func = ucontrol->value.integer.value[0];
-       spitz_ext_control(codec);
+       spitz_ext_control(card);
        return 1;
 }