android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: spitz: Fix kcontrols to use card instead of codec

Browse Source 
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>
This commit is contained in:
Liam Girdwood 2012-02-16 12:00:23 +00:00 committed by Mark Brown
parent 905b41956c
commit 0e66821f63
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sound/soc/pxa/spitz.c
View File

@ -44,9 +44,9 @@ static int spitz_jack_func;
static int spitz_spk_func; static int spitz_spk_func;
static int spitz_mic_gpio; 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) if (spitz_spk_func == SPITZ_SPK_ON)
snd_soc_dapm_enable_pin(dapm, "Ext Spk"); 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, static int spitz_set_jack(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) 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]) if (spitz_jack_func == ucontrol->value.integer.value[0])
return 0; return 0;
spitz_jack_func = ucontrol->value.integer.value[0]; spitz_jack_func = ucontrol->value.integer.value[0];
spitz_ext_control(codec); spitz_ext_control(card);
return 1; return 1;
} }
@ -193,13 +193,13 @@ static int spitz_get_spk(struct snd_kcontrol *kcontrol,
static int spitz_set_spk(struct snd_kcontrol *kcontrol, static int spitz_set_spk(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) 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]) if (spitz_spk_func == ucontrol->value.integer.value[0])
return 0; return 0;
spitz_spk_func = ucontrol->value.integer.value[0]; spitz_spk_func = ucontrol->value.integer.value[0];
spitz_ext_control(codec); spitz_ext_control(card);
return 1; return 1;
} }