diff options
author | Mark Brown <broonie@linaro.org> | 2013-06-30 12:42:24 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-06-30 12:42:24 +0100 |
commit | e4ca49d5d832c3eff23a44aacf21387629b1207b (patch) | |
tree | 997849dbb46b424ff52604b0345bf1267054310f /sound/soc/codecs/wm8400.c | |
parent | Merge remote-tracking branch 'asoc/topic/adsp' into asoc-next (diff) | |
parent | ASoC: 88pm860x: Use SND_SOC_DAPM_PGA_E() instead of open-coding it (diff) | |
download | linux-dev-e4ca49d5d832c3eff23a44aacf21387629b1207b.tar.xz linux-dev-e4ca49d5d832c3eff23a44aacf21387629b1207b.zip |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8400.c')
-rw-r--r-- | sound/soc/codecs/wm8400.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8400.c b/sound/soc/codecs/wm8400.c index af6d227e67be..d2a092850283 100644 --- a/sound/soc/codecs/wm8400.c +++ b/sound/soc/codecs/wm8400.c @@ -143,13 +143,8 @@ static int wm8400_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, } #define WM8400_OUTPGA_SINGLE_R_TLV(xname, reg, shift, max, invert, tlv_array) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = (xname), \ - .access = SNDRV_CTL_ELEM_ACCESS_TLV_READ |\ - SNDRV_CTL_ELEM_ACCESS_READWRITE,\ - .tlv.p = (tlv_array), \ - .info = snd_soc_info_volsw, \ - .get = snd_soc_get_volsw, .put = wm8400_outpga_put_volsw_vu, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } + SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \ + snd_soc_get_volsw, wm8400_outpga_put_volsw_vu, tlv_array) static const char *wm8400_digital_sidetone[] = |