openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: Make the DAPM power check an operation on the widget 

Rather than having switch statements at point of use make the DAPM
power check a member of the widget structure and set it when we
instantiate the widget.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Mark Brown 2009-04-20 17:56:13 +01:00
parent 6ea31b9f0a
commit b75576d76d
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/soc-dapm.h
View File

@ -367,6 +367,8 @@ struct snd_soc_dapm_widget {
unsigned char suspend:1; /* was active before suspend */ unsigned char suspend:1; /* was active before suspend */
unsigned char pmdown:1; /* waiting for timeout */ unsigned char pmdown:1; /* waiting for timeout */
int (*power_check)(struct snd_soc_dapm_widget *w);
/* external events */ /* external events */
unsigned short event_flags; /* flags to specify event types */ unsigned short event_flags; /* flags to specify event types */
int (*event)(struct snd_soc_dapm_widget*, struct snd_kcontrol *, int); int (*event)(struct snd_soc_dapm_widget*, struct snd_kcontrol *, int);

27
sound/soc/soc-dapm.c
View File

@ -631,20 +631,7 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event,
{ {
int power, ret; int power, ret;
/* Work out the new power state */
switch (w->id) { switch (w->id) {
case snd_soc_dapm_vmid:
/* No action required */
return 0;
case snd_soc_dapm_adc:
power = dapm_adc_check_power(w);
break;
case snd_soc_dapm_dac:
power = dapm_dac_check_power(w);
break;
case snd_soc_dapm_pre: case snd_soc_dapm_pre:
if (!w->event) if (!w->event)
return 0; return 0;
@ -680,10 +667,13 @@ static int dapm_power_widget(struct snd_soc_codec *codec, int event,
return 0; return 0;
default: default:
power = dapm_generic_check_power(w);
break; break;
} }
if (!w->power_check)
return 0;
power = w->power_check(w);
if (w->power == power) if (w->power == power)
return 0; return 0;
w->power = power; w->power = power;
@ -1147,15 +1137,22 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)
case snd_soc_dapm_switch: case snd_soc_dapm_switch:
case snd_soc_dapm_mixer: case snd_soc_dapm_mixer:
case snd_soc_dapm_mixer_named_ctl: case snd_soc_dapm_mixer_named_ctl:
w->power_check = dapm_generic_check_power;
dapm_new_mixer(codec, w); dapm_new_mixer(codec, w);
break; break;
case snd_soc_dapm_mux: case snd_soc_dapm_mux:
case snd_soc_dapm_value_mux: case snd_soc_dapm_value_mux:
w->power_check = dapm_generic_check_power;
dapm_new_mux(codec, w); dapm_new_mux(codec, w);
break; break;
case snd_soc_dapm_adc: case snd_soc_dapm_adc:
w->power_check = dapm_adc_check_power;
break;
case snd_soc_dapm_dac: case snd_soc_dapm_dac:
w->power_check = dapm_dac_check_power;
break;
case snd_soc_dapm_pga: case snd_soc_dapm_pga:
w->power_check = dapm_generic_check_power;
dapm_new_pga(codec, w); dapm_new_pga(codec, w);
break; break;
case snd_soc_dapm_input: case snd_soc_dapm_input:
@ -1165,6 +1162,8 @@ int snd_soc_dapm_new_widgets(struct snd_soc_codec *codec)
case snd_soc_dapm_hp: case snd_soc_dapm_hp:
case snd_soc_dapm_mic: case snd_soc_dapm_mic:
case snd_soc_dapm_line: case snd_soc_dapm_line:
w->power_check = dapm_generic_check_power;
break;
case snd_soc_dapm_vmid: case snd_soc_dapm_vmid:
case snd_soc_dapm_pre: case snd_soc_dapm_pre:
case snd_soc_dapm_post: case snd_soc_dapm_post: