diff options
author | Liam Girdwood <lrg@ti.com> | 2012-02-16 07:00:23 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-16 11:24:40 -0500 |
commit | 0e66821f63b3bf1468f5793759beb09b3e1ffa4f (patch) | |
tree | 2c994e58f59f19d75020651b7dfebd674ab8bf47 /sound/soc/pxa/spitz.c | |
parent | 905b41956c81e5914470a13a166d4b4c4ee71f92 (diff) |
ASoC: spitz: Fix kcontrols to use card instead of codec
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>
Diffstat (limited to 'sound/soc/pxa/spitz.c')
-rw-r--r-- | sound/soc/pxa/spitz.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/pxa/spitz.c b/sound/soc/pxa/spitz.c index 90c5245c4742..4d108dc52e2e 100644 --- a/sound/soc/pxa/spitz.c +++ b/sound/soc/pxa/spitz.c | |||
@@ -44,9 +44,9 @@ static int spitz_jack_func; | |||
44 | static int spitz_spk_func; | 44 | static int spitz_spk_func; |
45 | static int spitz_mic_gpio; | 45 | static int spitz_mic_gpio; |
46 | 46 | ||
47 | static void spitz_ext_control(struct snd_soc_codec *codec) | 47 | static void spitz_ext_control(struct snd_soc_card *card) |
48 | { | 48 | { |
49 | struct snd_soc_dapm_context *dapm = &codec->dapm; | 49 | struct snd_soc_dapm_context *dapm = &card->dapm; |
50 | 50 | ||
51 | if (spitz_spk_func == SPITZ_SPK_ON) | 51 | if (spitz_spk_func == SPITZ_SPK_ON) |
52 | snd_soc_dapm_enable_pin(dapm, "Ext Spk"); | 52 | snd_soc_dapm_enable_pin(dapm, "Ext Spk"); |
@@ -173,13 +173,13 @@ static int spitz_get_jack(struct snd_kcontrol *kcontrol, | |||
173 | static int spitz_set_jack(struct snd_kcontrol *kcontrol, | 173 | static int spitz_set_jack(struct snd_kcontrol *kcontrol, |
174 | struct snd_ctl_elem_value *ucontrol) | 174 | struct snd_ctl_elem_value *ucontrol) |
175 | { | 175 | { |
176 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 176 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
177 | 177 | ||
178 | if (spitz_jack_func == ucontrol->value.integer.value[0]) | 178 | if (spitz_jack_func == ucontrol->value.integer.value[0]) |
179 | return 0; | 179 | return 0; |
180 | 180 | ||
181 | spitz_jack_func = ucontrol->value.integer.value[0]; | 181 | spitz_jack_func = ucontrol->value.integer.value[0]; |
182 | spitz_ext_control(codec); | 182 | spitz_ext_control(card); |
183 | return 1; | 183 | return 1; |
184 | } | 184 | } |
185 | 185 | ||
@@ -193,13 +193,13 @@ static int spitz_get_spk(struct snd_kcontrol *kcontrol, | |||
193 | static int spitz_set_spk(struct snd_kcontrol *kcontrol, | 193 | static int spitz_set_spk(struct snd_kcontrol *kcontrol, |
194 | struct snd_ctl_elem_value *ucontrol) | 194 | struct snd_ctl_elem_value *ucontrol) |
195 | { | 195 | { |
196 | struct snd_soc_codec *codec = snd_kcontrol_chip(kcontrol); | 196 | struct snd_soc_card *card = snd_kcontrol_chip(kcontrol); |
197 | 197 | ||
198 | if (spitz_spk_func == ucontrol->value.integer.value[0]) | 198 | if (spitz_spk_func == ucontrol->value.integer.value[0]) |
199 | return 0; | 199 | return 0; |
200 | 200 | ||
201 | spitz_spk_func = ucontrol->value.integer.value[0]; | 201 | spitz_spk_func = ucontrol->value.integer.value[0]; |
202 | spitz_ext_control(codec); | 202 | spitz_ext_control(card); |
203 | return 1; | 203 | return 1; |
204 | } | 204 | } |
205 | 205 | ||