diff options
| author | Lars-Peter Clausen | 2015-05-15 12:41:30 +0200 |
|---|---|---|
| committer | Mark Brown | 2015-05-15 17:49:39 +0200 |
| commit | b8faaba4a655d58b67ba28598c22a48aa844b489 (patch) | |
| tree | e739973d269785f8c71944306e28222335b444e9 /sound | |
| parent | ASoC: twl6040: Replace direct snd_soc_codec dapm field access (diff) | |
| download | kernel-qcow2-linux-b8faaba4a655d58b67ba28598c22a48aa844b489.tar.gz kernel-qcow2-linux-b8faaba4a655d58b67ba28598c22a48aa844b489.tar.xz kernel-qcow2-linux-b8faaba4a655d58b67ba28598c22a48aa844b489.zip | |
ASoC: Drop unnecessary bias level check on resume
The suspended flag will only be set if the CODEC bias level was either
STANDBY or OFF. This means we don't need to check for that on resume since
the condition will always be true.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/soc-core.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 23732523f87c..95b5f034d864 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -750,23 +750,10 @@ static void soc_resume_deferred(struct work_struct *work) } list_for_each_entry(codec, &card->codec_dev_list, card_list) { - /* If the CODEC was idle over suspend then it will have been - * left with bias OFF or STANDBY and suspended so we must now - * resume. Otherwise the suspend was suppressed. - */ if (codec->suspended) { - switch (codec->dapm.bias_level) { - case SND_SOC_BIAS_STANDBY: - case SND_SOC_BIAS_OFF: - if (codec->driver->resume) - codec->driver->resume(codec); - codec->suspended = 0; - break; - default: - dev_dbg(codec->dev, - "ASoC: CODEC was on over suspend\n"); - break; - } + if (codec->driver->resume) + codec->driver->resume(codec); + codec->suspended = 0; } } |