diff options
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r-- | include/sound/soc-dapm.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 2f76a51bbaac..aef975f47bad 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -227,13 +227,6 @@ | |||
227 | .info = snd_soc_info_volsw, \ | 227 | .info = snd_soc_info_volsw, \ |
228 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ | 228 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ |
229 | .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } | 229 | .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } |
230 | #define SOC_DAPM_DOUBLE(xname, reg, shift_left, shift_right, max, invert, \ | ||
231 | power) \ | ||
232 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ | ||
233 | .info = snd_soc_info_volsw, \ | ||
234 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ | ||
235 | .private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) |\ | ||
236 | ((max) << 16) | ((invert) << 24) } | ||
237 | #define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \ | 230 | #define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \ |
238 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 231 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
239 | .info = snd_soc_info_volsw, \ | 232 | .info = snd_soc_info_volsw, \ |
@@ -241,15 +234,6 @@ | |||
241 | .tlv.p = (tlv_array), \ | 234 | .tlv.p = (tlv_array), \ |
242 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ | 235 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ |
243 | .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } | 236 | .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } |
244 | #define SOC_DAPM_DOUBLE_TLV(xname, reg, shift_left, shift_right, max, invert, \ | ||
245 | power, tlv_array) \ | ||
246 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ | ||
247 | .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ | SNDRV_CTL_ELEM_ACCESS_READWRITE,\ | ||
248 | .tlv.p = (tlv_array), \ | ||
249 | .info = snd_soc_info_volsw, \ | ||
250 | .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ | ||
251 | .private_value = (reg) | ((shift_left) << 8) | ((shift_right) << 12) |\ | ||
252 | ((max) << 16) | ((invert) << 24) } | ||
253 | #define SOC_DAPM_ENUM(xname, xenum) \ | 237 | #define SOC_DAPM_ENUM(xname, xenum) \ |
254 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ | 238 | { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ |
255 | .info = snd_soc_info_enum_double, \ | 239 | .info = snd_soc_info_enum_double, \ |