summaryrefslogtreecommitdiff
path: root/sound/soc/codecs/twl6040.c
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-10-05 11:29:26 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-05 20:10:10 +0400
commitdb382da5ff286b406c4819cc9ebd96bbb680884c (patch)
tree9f8e6b8603425d7dbef81fab984943c77aaf8e49 /sound/soc/codecs/twl6040.c
parent974815ba4f88f3f12f6f01384e822b23be058323 (diff)
downloadlinux-db382da5ff286b406c4819cc9ebd96bbb680884c.tar.xz
ASoC: twl6040: Simply call snd_soc_put_volsw form the custom code
The ASoC core now have one callback function, which can handle single, and double register mixer controls. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/twl6040.c')
-rw-r--r--sound/soc/codecs/twl6040.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index c9a601d43ca2..7450e1bb8164 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -746,7 +746,7 @@ static int twl6040_put_volsw(struct snd_kcontrol *kcontrol,
struct twl6040_output *out = NULL;
struct soc_mixer_control *mc =
(struct soc_mixer_control *)kcontrol->private_value;
- int ret, type_2r;
+ int ret;
/* For HS and HF we shadow the values and only actually write
* them out when active in order to ensure the amplifier comes on
@@ -754,11 +754,9 @@ static int twl6040_put_volsw(struct snd_kcontrol *kcontrol,
switch (mc->reg) {
case TWL6040_REG_HSGAIN:
out = &twl6040_priv->headset;
- type_2r = 0;
break;
case TWL6040_REG_HFLGAIN:
out = &twl6040_priv->handsfree;
- type_2r = 1;
break;
default:
return -EINVAL;
@@ -769,12 +767,7 @@ static int twl6040_put_volsw(struct snd_kcontrol *kcontrol,
if (!out->active)
return 1;
- /* call the appropriate handler depending on the rreg */
- if (type_2r)
- ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
- else
- ret = snd_soc_put_volsw(kcontrol, ucontrol);
-
+ ret = snd_soc_put_volsw(kcontrol, ucontrol);
if (ret < 0)
return ret;