Commit 50ae8384 authored by Mark Brown's avatar Mark Brown

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: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 29e189c2
...@@ -427,7 +427,6 @@ struct snd_soc_dapm_widget { ...@@ -427,7 +427,6 @@ struct snd_soc_dapm_widget {
unsigned char connected:1; /* connected codec pin */ unsigned char connected:1; /* connected codec pin */
unsigned char new:1; /* cnew complete */ unsigned char new:1; /* cnew complete */
unsigned char ext:1; /* has external widgets */ unsigned char ext:1; /* has external widgets */
unsigned char suspend:1; /* was active before suspend */
unsigned char force:1; /* force state */ unsigned char force:1; /* force state */
int (*power_check)(struct snd_soc_dapm_widget *w); int (*power_check)(struct snd_soc_dapm_widget *w);
......
...@@ -2012,18 +2012,8 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, ...@@ -2012,18 +2012,8 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec,
w->active = 0; w->active = 0;
break; break;
case SND_SOC_DAPM_STREAM_SUSPEND: case SND_SOC_DAPM_STREAM_SUSPEND:
if (w->active)
w->suspend = 1;
w->active = 0;
break;
case SND_SOC_DAPM_STREAM_RESUME: case SND_SOC_DAPM_STREAM_RESUME:
if (w->suspend) {
w->active = 1;
w->suspend = 0;
}
break;
case SND_SOC_DAPM_STREAM_PAUSE_PUSH: case SND_SOC_DAPM_STREAM_PAUSE_PUSH:
break;
case SND_SOC_DAPM_STREAM_PAUSE_RELEASE: case SND_SOC_DAPM_STREAM_PAUSE_RELEASE:
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment