All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	Jyri Sarha <jsarha@ti.com>,
	Peter Ujfalusi <peter.ujfalusi@ti.com>,
	Vishwas A Deshpande <vishwas.a.deshpande@ti.com>,
	M R Swami Reddy <mr.swami.reddy@ti.com>
Subject: [PATCH 05/11] ASoC: tlv320aic23: Cleanup manual bias level transitions
Date: Wed, 26 Nov 2014 20:57:54 +0100	[thread overview]
Message-ID: <1417031880-11364-5-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1417031880-11364-1-git-send-email-lars@metafoo.de>

Set the CODEC driver's suspend_bias_off flag rather than manually going to
SND_SOC_BIAS_OFF in suspend and SND_SOC_BIAS_STANDBY in resume. This makes
the code a bit shorter and cleaner.

Since the ASoC core now takes care of setting the bias level to
SND_SOC_BIAS_OFF when removing the CODEC there is no need to do it manually
anymore either.

The manual transition to SND_SOC_BIAS_STANDBY at the end of CODEC probe()
can also be removed as the core will automatically do this after the CODEC
has been probed.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/codecs/tlv320aic23.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
index d671679..cc17e7e 100644
--- a/sound/soc/codecs/tlv320aic23.c
+++ b/sound/soc/codecs/tlv320aic23.c
@@ -540,19 +540,11 @@ static struct snd_soc_dai_driver tlv320aic23_dai = {
 	.ops = &tlv320aic23_dai_ops,
 };
 
-static int tlv320aic23_suspend(struct snd_soc_codec *codec)
-{
-	tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);
-
-	return 0;
-}
-
 static int tlv320aic23_resume(struct snd_soc_codec *codec)
 {
 	struct aic23 *aic23 = snd_soc_codec_get_drvdata(codec);
 	regcache_mark_dirty(aic23->regmap);
 	regcache_sync(aic23->regmap);
-	tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
 
 	return 0;
 }
@@ -562,9 +554,6 @@ static int tlv320aic23_codec_probe(struct snd_soc_codec *codec)
 	/* Reset codec */
 	snd_soc_write(codec, TLV320AIC23_RESET, 0);
 
-	/* power on device */
-	tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
 	snd_soc_write(codec, TLV320AIC23_DIGT, TLV320AIC23_DEEMP_44K);
 
 	/* Unmute input */
@@ -589,18 +578,12 @@ static int tlv320aic23_codec_probe(struct snd_soc_codec *codec)
 	return 0;
 }
 
-static int tlv320aic23_remove(struct snd_soc_codec *codec)
-{
-	tlv320aic23_set_bias_level(codec, SND_SOC_BIAS_OFF);
-	return 0;
-}
-
 static struct snd_soc_codec_driver soc_codec_dev_tlv320aic23 = {
 	.probe = tlv320aic23_codec_probe,
-	.remove = tlv320aic23_remove,
-	.suspend = tlv320aic23_suspend,
 	.resume = tlv320aic23_resume,
 	.set_bias_level = tlv320aic23_set_bias_level,
+	.suspend_bias_off = true,
+
 	.controls = tlv320aic23_snd_controls,
 	.num_controls = ARRAY_SIZE(tlv320aic23_snd_controls),
 	.dapm_widgets = tlv320aic23_dapm_widgets,
-- 
1.8.0

  parent reply	other threads:[~2014-11-26 21:28 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-26 19:57 [PATCH 01/11] ASoC: cq93vc: Remove unused state struct Lars-Peter Clausen
2014-11-26 19:57 ` [PATCH 02/11] ASoC: cq93vc: Cleanup manual bias level transitions Lars-Peter Clausen
2014-11-27 11:11   ` Mark Brown
2014-11-26 19:57 ` [PATCH 03/11] ASoC: lm49453: " Lars-Peter Clausen
2014-11-27 11:14   ` Mark Brown
2014-11-26 19:57 ` [PATCH 04/11] ASoC: sn95031: Cleanup " Lars-Peter Clausen
2014-11-27 11:15   ` Mark Brown
2014-11-26 19:57 ` Lars-Peter Clausen [this message]
2014-11-27 11:15   ` [PATCH 05/11] ASoC: tlv320aic23: Cleanup manual " Mark Brown
2014-11-26 19:57 ` [PATCH 06/11] ASoC: tlv320aix31xx: " Lars-Peter Clausen
2014-11-27  8:30   ` Jyri Sarha
2014-11-27 11:16   ` Mark Brown
2014-11-26 19:57 ` [PATCH 07/11] ASoC: tlv320aic32x4: " Lars-Peter Clausen
2014-11-27 11:16   ` Mark Brown
2014-11-26 19:57 ` [PATCH 08/11] ASoC: tlv320aic3x: " Lars-Peter Clausen
2014-11-27 11:17   ` Mark Brown
2014-11-26 19:57 ` [PATCH 09/11] ASoC: tlv320dac33: " Lars-Peter Clausen
2014-11-27 11:17   ` Mark Brown
2014-11-26 19:57 ` [PATCH 10/11] ASoC: twl4030: " Lars-Peter Clausen
2014-11-27 11:18   ` Mark Brown
2014-11-26 19:58 ` [PATCH 11/11] ASoC: twl6040: " Lars-Peter Clausen
2014-11-27 11:18   ` Mark Brown
2014-11-27 11:11 ` [PATCH 01/11] ASoC: cq93vc: Remove unused state struct 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=1417031880-11364-5-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=jsarha@ti.com \
    --cc=lgirdwood@gmail.com \
    --cc=mr.swami.reddy@ti.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.