aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 88ff2d899a4d..2d0c1d20a8f6 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -63,7 +63,7 @@
63 max, invert) } 63 max, invert) }
64#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \ 64#define SOC_DOUBLE_R(xname, reg_left, reg_right, xshift, xmax, xinvert) \
65{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ 65{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \
66 .info = snd_soc_info_volsw_2r, \ 66 .info = snd_soc_info_volsw, \
67 .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \ 67 .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
68 .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \ 68 .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
69 xmax, xinvert) } 69 xmax, xinvert) }
@@ -81,7 +81,7 @@
81 .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ 81 .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\
82 SNDRV_CTL_ELEM_ACCESS_READWRITE,\ 82 SNDRV_CTL_ELEM_ACCESS_READWRITE,\
83 .tlv.p = (tlv_array), \ 83 .tlv.p = (tlv_array), \
84 .info = snd_soc_info_volsw_2r, \ 84 .info = snd_soc_info_volsw, \
85 .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \ 85 .get = snd_soc_get_volsw_2r, .put = snd_soc_put_volsw_2r, \
86 .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \ 86 .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
87 xmax, xinvert) } 87 xmax, xinvert) }
@@ -156,7 +156,7 @@
156 .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \ 156 .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | \
157 SNDRV_CTL_ELEM_ACCESS_READWRITE, \ 157 SNDRV_CTL_ELEM_ACCESS_READWRITE, \
158 .tlv.p = (tlv_array), \ 158 .tlv.p = (tlv_array), \
159 .info = snd_soc_info_volsw_2r, \ 159 .info = snd_soc_info_volsw, \
160 .get = xhandler_get, .put = xhandler_put, \ 160 .get = xhandler_get, .put = xhandler_put, \
161 .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \ 161 .private_value = SOC_DOUBLE_R_VALUE(reg_left, reg_right, xshift, \
162 xmax, xinvert) } 162 xmax, xinvert) }
@@ -393,8 +393,6 @@ int snd_soc_get_volsw(struct snd_kcontrol *kcontrol,
393 struct snd_ctl_elem_value *ucontrol); 393 struct snd_ctl_elem_value *ucontrol);
394int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, 394int snd_soc_put_volsw(struct snd_kcontrol *kcontrol,
395 struct snd_ctl_elem_value *ucontrol); 395 struct snd_ctl_elem_value *ucontrol);
396int snd_soc_info_volsw_2r(struct snd_kcontrol *kcontrol,
397 struct snd_ctl_elem_info *uinfo);
398int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol, 396int snd_soc_get_volsw_2r(struct snd_kcontrol *kcontrol,
399 struct snd_ctl_elem_value *ucontrol); 397 struct snd_ctl_elem_value *ucontrol);
400int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol, 398int snd_soc_put_volsw_2r(struct snd_kcontrol *kcontrol,