summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-07 18:40:54 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-05-10 10:35:55 +0100
commit50ae8384cde9a67714ff03010493c5052690624e (patch)
treed2757bae97d2e6b88c85e2ff953e2eac1a580e4d
parent29e189c29d33d273424327ca4c1a74d8cdc04f48 (diff)
downloadlinux-50ae8384cde9a67714ff03010493c5052690624e.tar.gz
linux-50ae8384cde9a67714ff03010493c5052690624e.tar.bz2
linux-50ae8384cde9a67714ff03010493c5052690624e.zip
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.h1
-rw-r--r--sound/soc/soc-dapm.c10
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 {
unsigned char connected:1; /* connected codec pin */
unsigned char new:1; /* cnew complete */
unsigned char ext:1; /* has external widgets */
- unsigned char suspend:1; /* was active before suspend */
unsigned char force:1; /* force state */
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,
w->active = 0;
break;
case SND_SOC_DAPM_STREAM_SUSPEND:
- if (w->active)
- w->suspend = 1;
- w->active = 0;
- break;
case SND_SOC_DAPM_STREAM_RESUME:
- if (w->suspend) {
- w->active = 1;
- w->suspend = 0;
- }
- break;
case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
- break;
case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
break;
}