hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Lars-Peter Clausen 2015-03-30 21:04:50 +02:00 committed by Mark Brown
parent a1f0b96749
commit 37660b6daf
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/sound/soc-dapm.h
View File

@ -586,7 +586,6 @@ struct snd_soc_dapm_update {
/* DAPM context */ /* DAPM context */
struct snd_soc_dapm_context { struct snd_soc_dapm_context {
enum snd_soc_bias_level bias_level; enum snd_soc_bias_level bias_level;
enum snd_soc_bias_level suspend_bias_level;
struct delayed_work delayed_work; struct delayed_work delayed_work;
unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */ unsigned int idle_bias_off:1; /* Use BIAS_OFF instead of STANDBY */
/* Go to BIAS_OFF in suspend if the DAPM context is idle */ /* Go to BIAS_OFF in suspend if the DAPM context is idle */

10
sound/soc/soc-core.c
View File

@ -583,15 +583,9 @@ int snd_soc_suspend(struct device *dev)
cpu_dai->driver->suspend(cpu_dai); cpu_dai->driver->suspend(cpu_dai);
} }
/* close any waiting streams and save state */ /* close any waiting streams */
for (i = 0; i < card->num_rtd; i++) { for (i = 0; i < card->num_rtd; i++)
struct snd_soc_dai **codec_dais = card->rtd[i].codec_dais;
flush_delayed_work(&card->rtd[i].delayed_work); 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++) { for (i = 0; i < card->num_rtd; i++) {