alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
To: alsa-devel@alsa-project.org
Cc: broonie@opensource.wolfsonmicro.com, lrg@slimlogic.co.uk
Subject: [PATCH v2 2/8] ASoC: TWL4030: Remove wrapper for power down
Date: Wed, 26 May 2010 11:38:15 +0300	[thread overview]
Message-ID: <1274863101-18514-3-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1274863101-18514-1-git-send-email-peter.ujfalusi@nokia.com>

There is no need for the power down wrapper.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/twl4030.c |   13 ++-----------
 1 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 9a3e999..1e0aba5 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -319,15 +319,6 @@ static void twl4030_power_up(struct snd_soc_codec *codec)
 	twl4030_codec_enable(codec, 1);
 }

-/*
- * Unconditional power down
- */
-static void twl4030_power_down(struct snd_soc_codec *codec)
-{
-	/* power down */
-	twl4030_codec_enable(codec, 0);
-}
-
 /* Earpiece */
 static const struct snd_kcontrol_new twl4030_dapm_earpiece_controls[] = {
 	SOC_DAPM_SINGLE("Voice", TWL4030_REG_EAR_CTL, 0, 1, 0),
@@ -1607,7 +1598,7 @@ static int twl4030_set_bias_level(struct snd_soc_codec *codec,
 			twl4030_power_up(codec);
 		break;
 	case SND_SOC_BIAS_OFF:
-		twl4030_power_down(codec);
+		twl4030_codec_enable(codec, 0);
 		break;
 	}
 	codec->bias_level = level;
@@ -2321,7 +2312,7 @@ static int __devinit twl4030_codec_probe(struct platform_device *pdev)
 	return 0;

 error_codec:
-	twl4030_power_down(codec);
+	twl4030_codec_enable(codec, 0);
 	kfree(codec->reg_cache);
 error_cache:
 	kfree(twl4030);
--
1.7.1

  parent reply	other threads:[~2010-05-26  8:38 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-05-26  8:38 [PATCH v2 0/8] ASoC: TWL4030: put the codec to off when not active Peter Ujfalusi
2010-05-26  8:38 ` [PATCH v2 1/8] ASoC: TWL4030: Revisit codec defaults Peter Ujfalusi
2010-05-26  8:38 ` Peter Ujfalusi [this message]
2010-05-26  8:38 ` [PATCH v2 3/8] ASoC: TWL4030: Make offset cancellation path configurable Peter Ujfalusi
2010-05-26  8:38 ` [PATCH v2 4/8] ASoC: TWL4030: Optimize the power up sequence Peter Ujfalusi
2010-05-26  8:38 ` [PATCH v2 5/8] ASoC: TWL4030: Helper to check chip default registers Peter Ujfalusi
2010-05-26  8:38 ` [PATCH v2 6/8] ASoC: TWL4030: Correct the ARXR2_APGA_CTL chip default Peter Ujfalusi
2010-05-26  8:38 ` [PATCH v2 7/8] ASoC: TWL4030: Use BIAS_OFF instead of BIAS_STANDBY, when not in use Peter Ujfalusi
2010-05-26  8:38 ` [PATCH v2 8/8] ASoC: TWL4030: Add functionalty to reset the registers Peter Ujfalusi
2010-05-26 20:09   ` Mark Brown
2010-05-31  9:39 ` [PATCH v2 0/8] ASoC: TWL4030: put the codec to off when not active Liam Girdwood

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=1274863101-18514-3-git-send-email-peter.ujfalusi@nokia.com \
    --to=peter.ujfalusi@nokia.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=lrg@slimlogic.co.uk \
    /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).