Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

include/sound/soc-dapm.h

+0 −1
Original line number Diff line number Diff line
@@ -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);

sound/soc/soc-dapm.c

+0 −10
Original line number Diff line number Diff line
@@ -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;

			}