diff options
author | Mark Brown <broonie@linaro.org> | 2013-07-18 17:03:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-07-24 09:56:15 -0400 |
commit | 63c69a6e4134a2085d40e40c02a395dd1bd8c023 (patch) | |
tree | ab724620b7b901129cf0f3d2e1fbba785ce7865a | |
parent | 56a678344273fd63f8ade26876283a2586a9bf3a (diff) |
ASoC: dapm: Use generic power check for everything except DAIs
As noticed by Lars-Peter Clausen since the move to using widgets to hook
into the DAIs we no longer directly manage the power of AIF or DAC/ADC
widgets from the stream integration so they can just use the generic power
checks instead of the custom stream integration ones they currently do.
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | sound/soc/soc-dapm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index bd16010441cc..378655839f74 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -3126,16 +3126,16 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, | |||
3126 | case snd_soc_dapm_value_mux: | 3126 | case snd_soc_dapm_value_mux: |
3127 | w->power_check = dapm_generic_check_power; | 3127 | w->power_check = dapm_generic_check_power; |
3128 | break; | 3128 | break; |
3129 | case snd_soc_dapm_adc: | ||
3130 | case snd_soc_dapm_aif_out: | ||
3131 | case snd_soc_dapm_dai_out: | 3129 | case snd_soc_dapm_dai_out: |
3132 | w->power_check = dapm_adc_check_power; | 3130 | w->power_check = dapm_adc_check_power; |
3133 | break; | 3131 | break; |
3134 | case snd_soc_dapm_dac: | ||
3135 | case snd_soc_dapm_aif_in: | ||
3136 | case snd_soc_dapm_dai_in: | 3132 | case snd_soc_dapm_dai_in: |
3137 | w->power_check = dapm_dac_check_power; | 3133 | w->power_check = dapm_dac_check_power; |
3138 | break; | 3134 | break; |
3135 | case snd_soc_dapm_adc: | ||
3136 | case snd_soc_dapm_aif_out: | ||
3137 | case snd_soc_dapm_dac: | ||
3138 | case snd_soc_dapm_aif_in: | ||
3139 | case snd_soc_dapm_pga: | 3139 | case snd_soc_dapm_pga: |
3140 | case snd_soc_dapm_out_drv: | 3140 | case snd_soc_dapm_out_drv: |
3141 | case snd_soc_dapm_input: | 3141 | case snd_soc_dapm_input: |