From: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
To: Liam Girdwood <lrg@ti.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Takashi Iwai <tiwai@suse.de>, alsa-devel@alsa-project.org
Subject: [PATCH] ASoC: dapm: Remove stereo from snd_soc_dapm_get_volsw()
Date: Mon, 2 Jul 2012 17:19:47 +0200 (CEST) [thread overview]
Message-ID: <681621148.529589.1341242387391.JavaMail.root@advansee.com> (raw)
In-Reply-To: <1942519503.529549.1341242344149.JavaMail.root@advansee.com>
Stereo is not yet supported by dapm widgets, so remove stereo code from
snd_soc_dapm_get_volsw().
Cc: Liam Girdwood <lrg@ti.com>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: <alsa-devel@alsa-project.org>
Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau@advansee.com>
---
.../sound/soc/soc-dapm.c | 12 ++----------
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git linux-next-HEAD-5d2b7d6.orig/sound/soc/soc-dapm.c linux-next-HEAD-5d2b7d6/sound/soc/soc-dapm.c
index c93e832..9333e01 100644
--- linux-next-HEAD-5d2b7d6.orig/sound/soc/soc-dapm.c
+++ linux-next-HEAD-5d2b7d6/sound/soc/soc-dapm.c
@@ -2464,23 +2464,15 @@ int snd_soc_dapm_get_volsw(struct snd_kcontrol *kcontrol,
(struct soc_mixer_control *)kcontrol->private_value;
unsigned int reg = mc->reg;
unsigned int shift = mc->shift;
- unsigned int rshift = mc->rshift;
int max = mc->max;
- unsigned int invert = mc->invert;
unsigned int mask = (1 << fls(max)) - 1;
+ unsigned int invert = mc->invert;
ucontrol->value.integer.value[0] =
(snd_soc_read(widget->codec, reg) >> shift) & mask;
- if (shift != rshift)
- ucontrol->value.integer.value[1] =
- (snd_soc_read(widget->codec, reg) >> rshift) & mask;
- if (invert) {
+ if (invert)
ucontrol->value.integer.value[0] =
max - ucontrol->value.integer.value[0];
- if (shift != rshift)
- ucontrol->value.integer.value[1] =
- max - ucontrol->value.integer.value[1];
- }
return 0;
}
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next parent reply other threads:[~2012-07-02 15:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1942519503.529549.1341242344149.JavaMail.root@advansee.com>
2012-07-02 15:19 ` Benoît Thébaudeau [this message]
2012-07-03 18:18 ` [PATCH v2] ASoC: dapm: Remove incomplete stereo code Benoît Thébaudeau
2012-07-03 18:54 ` 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=681621148.529589.1341242387391.JavaMail.root@advansee.com \
--to=benoit.thebaudeau@advansee.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=lrg@ti.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox