From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: alsa-devel@alsa-project.org, Lars-Peter Clausen <lars@metafoo.de>,
patches@opensource.wolfsonmicro.com,
Peter Ujfalusi <peter.ujfalusi@ti.com>,
Vishwas A Deshpande <vishwas.a.deshpande@ti.com>,
M R Swami Reddy <mr.swami.reddy@ti.com>,
Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Subject: [PATCH 5/5] ASoC: wm8995: Remove unnecessary suspend/resume bias level changes
Date: Tue, 2 Sep 2014 22:20:34 +0200 [thread overview]
Message-ID: <1409689234-14774-6-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1409689234-14774-1-git-send-email-lars@metafoo.de>
The ASoC core will only call the suspend/resume callbacks when the device's
DAPM context is idle. Since this driver sets idle_bias_off to true this
means that the device is already in SND_SOC_BIAS_OFF when the suspend
callback is called, so there is no need to manually set this state again.
There is also no need to go to SND_SOC_BIAS_STANDBY in the resume callback
since the core will go right back to SND_SOC_BIAS_OFF.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
sound/soc/codecs/wm8995.c | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/sound/soc/codecs/wm8995.c b/sound/soc/codecs/wm8995.c
index cae4ac5..1288ede 100644
--- a/sound/soc/codecs/wm8995.c
+++ b/sound/soc/codecs/wm8995.c
@@ -1998,23 +1998,6 @@ static int wm8995_set_bias_level(struct snd_soc_codec *codec,
return 0;
}
-#ifdef CONFIG_PM
-static int wm8995_suspend(struct snd_soc_codec *codec)
-{
- wm8995_set_bias_level(codec, SND_SOC_BIAS_OFF);
- return 0;
-}
-
-static int wm8995_resume(struct snd_soc_codec *codec)
-{
- wm8995_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
- return 0;
-}
-#else
-#define wm8995_suspend NULL
-#define wm8995_resume NULL
-#endif
-
static int wm8995_remove(struct snd_soc_codec *codec)
{
struct wm8995_priv *wm8995;
@@ -2220,8 +2203,6 @@ static struct snd_soc_dai_driver wm8995_dai[] = {
static struct snd_soc_codec_driver soc_codec_dev_wm8995 = {
.probe = wm8995_probe,
.remove = wm8995_remove,
- .suspend = wm8995_suspend,
- .resume = wm8995_resume,
.set_bias_level = wm8995_set_bias_level,
.idle_bias_off = true,
};
--
1.8.0
next prev parent reply other threads:[~2014-09-02 20:20 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-02 20:20 [PATCH 0/5] ASoC: Remove unnecessary suspend/resume bias level changes Lars-Peter Clausen
2014-09-02 20:20 ` [PATCH 1/5] ASoC: adau1373: " Lars-Peter Clausen
2014-09-02 20:20 ` [PATCH 2/5] ASoC: lm49453: " Lars-Peter Clausen
2014-09-02 20:20 ` [PATCH 3/5] ASoC: tlv320aic3x: " Lars-Peter Clausen
2014-09-02 20:20 ` [PATCH 4/5] ASoC: wm8804: " Lars-Peter Clausen
2014-09-03 8:21 ` Charles Keepax
2014-09-02 20:20 ` Lars-Peter Clausen [this message]
2014-09-03 8:22 ` [PATCH 5/5] ASoC: wm8995: " Charles Keepax
2014-09-03 18:26 ` [PATCH 0/5] ASoC: " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1409689234-14774-6-git-send-email-lars@metafoo.de \
--to=lars@metafoo.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.wolfsonmicro.com \
--cc=lgirdwood@gmail.com \
--cc=mr.swami.reddy@ti.com \
--cc=patches@opensource.wolfsonmicro.com \
--cc=peter.ujfalusi@ti.com \
--cc=vishwas.a.deshpande@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).