diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-07 13:40:54 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-05-10 05:35:55 -0400 |
| commit | 50ae8384cde9a67714ff03010493c5052690624e (patch) | |
| tree | d2757bae97d2e6b88c85e2ff953e2eac1a580e4d | |
| parent | 29e189c29d33d273424327ca4c1a74d8cdc04f48 (diff) | |
ASoC: Remove unused DAPM suspend flag
We now manage suspend within the main power analysis rather than by
flipping the state of widgets.
Tested-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | include/sound/soc-dapm.h | 1 | ||||
| -rw-r--r-- | sound/soc/soc-dapm.c | 10 |
2 files changed, 0 insertions, 11 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index d5d6ba862dfe..55c6d3d1894f 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
| @@ -427,7 +427,6 @@ struct snd_soc_dapm_widget { | |||
| 427 | unsigned char connected:1; /* connected codec pin */ | 427 | unsigned char connected:1; /* connected codec pin */ |
| 428 | unsigned char new:1; /* cnew complete */ | 428 | unsigned char new:1; /* cnew complete */ |
| 429 | unsigned char ext:1; /* has external widgets */ | 429 | unsigned char ext:1; /* has external widgets */ |
| 430 | unsigned char suspend:1; /* was active before suspend */ | ||
| 431 | unsigned char force:1; /* force state */ | 430 | unsigned char force:1; /* force state */ |
| 432 | 431 | ||
| 433 | int (*power_check)(struct snd_soc_dapm_widget *w); | 432 | int (*power_check)(struct snd_soc_dapm_widget *w); |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 476dbe6dabad..b30b0a255cd5 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
| @@ -2012,18 +2012,8 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, | |||
| 2012 | w->active = 0; | 2012 | w->active = 0; |
| 2013 | break; | 2013 | break; |
| 2014 | case SND_SOC_DAPM_STREAM_SUSPEND: | 2014 | case SND_SOC_DAPM_STREAM_SUSPEND: |
| 2015 | if (w->active) | ||
| 2016 | w->suspend = 1; | ||
| 2017 | w->active = 0; | ||
| 2018 | break; | ||
| 2019 | case SND_SOC_DAPM_STREAM_RESUME: | 2015 | case SND_SOC_DAPM_STREAM_RESUME: |
| 2020 | if (w->suspend) { | ||
| 2021 | w->active = 1; | ||
| 2022 | w->suspend = 0; | ||
| 2023 | } | ||
| 2024 | break; | ||
| 2025 | case SND_SOC_DAPM_STREAM_PAUSE_PUSH: | 2016 | case SND_SOC_DAPM_STREAM_PAUSE_PUSH: |
| 2026 | break; | ||
| 2027 | case SND_SOC_DAPM_STREAM_PAUSE_RELEASE: | 2017 | case SND_SOC_DAPM_STREAM_PAUSE_RELEASE: |
| 2028 | break; | 2018 | break; |
| 2029 | } | 2019 | } |
