ASoC: Remove suspend_bias_level from DAPM context struct

The only two users of the suspend_bias_level field were two rather old
drivers which weren't exactly doing things by the book. Those drivers have
been updated and field is now unused and can be removed.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

2 files changed, 2 insertions, 9 deletions

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8d7416e46861..9e35203653ff 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -586,7 +586,6 @@ struct snd_soc_dapm_update {
 /* DAPM context */
 struct snd_soc_dapm_context {
         enum snd_soc_bias_level bias_level;
-        enum snd_soc_bias_level suspend_bias_level;
         struct delayed_work delayed_work;
         unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
         /* Go to BIAS_OFF in suspend if the DAPM context is idle */
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 30579ca5bacb..72601a86a748 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -583,15 +583,9 @@ int snd_soc_suspend(struct device *dev)
                         cpu_dai->driver->suspend(cpu_dai);
         }
 
-        /* close any waiting streams and save state */
-        for (i = 0; i < card->num_rtd; i++) {
-                struct snd_soc_dai **codec_dais = card->rtd[i].codec_dais;
+        /* close any waiting streams */
+        for (i = 0; i < card->num_rtd; i++)
                 flush_delayed_work(&card->rtd[i].delayed_work);
-                for (j = 0; j < card->rtd[i].num_codecs; j++) {
-                        codec_dais[j]->codec->dapm.suspend_bias_level =
-                                        codec_dais[j]->codec->dapm.bias_level;
-                }
-        }
 
         for (i = 0; i < card->num_rtd; i++) {