summaryrefslogtreecommitdiffstats
path: root/include/sound/soc.h
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2011-10-05 10:29:24 +0300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-10-05 17:10:09 +0100
commitf7915d997554d4e2ce123c7a4ddd28e12c2e034c (patch)
tree9c676e63eab1afe14bfa94632a2ed28a6df44f9b /include/sound/soc.h
parente8f5a10307f7d224df91776033a0b8559a559844 (diff)
downloadop-kernel-dev-f7915d997554d4e2ce123c7a4ddd28e12c2e034c.zip
op-kernel-dev-f7915d997554d4e2ce123c7a4ddd28e12c2e034c.tar.gz
ASoC: core: Combine snd_soc_get_volsw/get_volsw_2r functions
Handle the get_volsw/get_volsw_2r in one function. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound/soc.h')
-rw-r--r--include/sound/soc.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 2d0c1d2..e5e424e 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -64,7 +64,7 @@
#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \
{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
.info = snd_soc_info_volsw, \
- .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
+ .get = snd_soc_get_volsw, .put = snd_soc_put_volsw_2r, \
.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
xmax, xinvert) }
#define SOC_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, tlv_array) \
@@ -82,7 +82,7 @@
SNDRV_CTL_ELEM_ACCESS_READWRITE,\
.tlv.p = (tlv_array), \
.info = snd_soc_info_volsw, \
- .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
+ .get = snd_soc_get_volsw, .put = snd_soc_put_volsw_2r, \
.private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
xmax, xinvert) }
#define SOC_DOUBLE_S8_TLV(xname, xreg, xmin, xmax, tlv_array) \
@@ -393,8 +393,6 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
-int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol,
- struct snd_ctl_elem_value *ucontrol);
int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol);
int snd_soc_info_volsw_s8(struct snd_kcontrol *kcontrol,
OpenPOWER on IntegriCloud