From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 7 May 2010 17:40:54 +0000 (+0100)
Subject: ASoC: Remove unused DAPM suspend flag
X-Git-Tag: MMI-PSA29.97-13-9~23168^2~7^2~18
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50ae8384cde9a67714ff03010493c5052690624e;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

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;
 			}