Skip to content

Commit

Permalink
ASoC: Remove unused DAPM suspend flag
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed May 10, 2010
1 parent 29e189c commit 50ae838
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 11 deletions.
1 change: 0 additions & 1 deletion include/sound/soc-dapm.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 0 additions & 10 deletions sound/soc/soc-dapm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 50ae838

Please sign in to comment.