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 <[email protected]>
Acked-by: Charles Keepax <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 8d7416e46861744d990f4c0dbb2d1f72fdd9407b..9e35203653ff1c72193bda7b94e340a1e9bcf906 100644 (file)
--- 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 30579ca5bacb985c7dfa9b9ad30f58cee45d6e1a..72601a86a7483933af3e62f2c40a63bbf8294601 100644 (file)
--- 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++) {