All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andres Salomon <dilinger@queued.net>
To: jayakumar.alsa@gmail.com
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
	Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 5/14] ALSA: cs5535audio: decouple HPF from V_REFOUT in OLPC code
Date: Thu, 6 Nov 2008 16:47:05 -0500	[thread overview]
Message-ID: <20081106164705.754a3044@ephemeral> (raw)


We shouldn't be touching V_REFOUT when we toggle HPF/analog input, so just
drop that code.

Signed-off-by: Andres Salomon <dilinger@debian.org>
---
 sound/pci/cs5535audio/cs5535audio_olpc.c |   25 ++++---------------------
 1 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/sound/pci/cs5535audio/cs5535audio_olpc.c b/sound/pci/cs5535audio/cs5535audio_olpc.c
index 16b41d4..ccefd55 100644
--- a/sound/pci/cs5535audio/cs5535audio_olpc.c
+++ b/sound/pci/cs5535audio/cs5535audio_olpc.c
@@ -30,18 +30,11 @@ static int snd_cs5535audio_ctl_get(struct snd_kcontrol *kcontrol,
 					struct snd_ctl_elem_value *ucontrol)
 {
 	struct cs5535audio *cs5535au = snd_kcontrol_chip(kcontrol);
-	u16 reg1, reg2;
+	u8 val;
 
-	/* if either AD1888 VRef Bias and High Pass Filter are enabled
-	or the EC is not in analog mode then flag as not in analog mode.
-	No EC command to read current analog state so we cache that. */
-	reg1 = snd_ac97_read(cs5535au->ac97, AC97_AD_MISC);
-	reg2 = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
-
-	if ((reg1 & AD1888_VREFOUT_EN_BIT) && (reg2 & AD1888_HPF_EN_BIT))
-		ucontrol->value.integer.value[0] = 1;
-	else
-		ucontrol->value.integer.value[0] = 0;
+	val = snd_ac97_read(cs5535au->ac97, AC97_AD_TEST2);
+	val >>= AC97_AD_HPFD_SHIFT;
+	ucontrol->value.integer.value[0] = val & 0x1;
 
 	return 0;
 }
@@ -57,16 +50,6 @@ static int snd_cs5535audio_ctl_put(struct snd_kcontrol *kcontrol,
 	/* value is 1 if analog input is desired */
 	value = ucontrol->value.integer.value[0];
 
-	/* sets High Z on VREF Bias if 1 */
-	if (value) 
-		err = snd_ac97_update_bits(ac97, AC97_AD_MISC, 
-				AD1888_VREFOUT_EN_BIT, AD1888_VREFOUT_EN_BIT);
-	else
-		err = snd_ac97_update_bits(ac97, AC97_AD_MISC, 
-				AD1888_VREFOUT_EN_BIT, 0);
-	if (err < 0)
-		snd_printk(KERN_ERR "Error updating AD_MISC %d\n", err);
-
 	/* turns off High Pass Filter if 1 */
 	if (value)
 		err = snd_ac97_update_bits(ac97, AC97_AD_TEST2, 
-- 
1.5.6.5


                 reply	other threads:[~2008-11-06 21:47 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20081106164705.754a3044@ephemeral \
    --to=dilinger@queued.net \
    --cc=akpm@linux-foundation.org \
    --cc=jayakumar.alsa@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tiwai@suse.de \
    /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.