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/wm8990.c | |
| parent | fbc6c4ee659da5bdd49ab85c5d7e50c51db1b4fa (diff) | |
| parent | f0ddb219c9f92d0c43582a000e1ddc0a4ee43222 (diff) | |
| download | linux-e4ca49d5d832c3eff23a44aacf21387629b1207b.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8990.c')
| -rw-r--r-- | sound/soc/codecs/wm8990.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8990.c b/sound/soc/codecs/wm8990.c index 837978e16e9d..253c88bb7a4c 100644 --- a/sound/soc/codecs/wm8990.c +++ b/sound/soc/codecs/wm8990.c @@ -151,14 +151,9 @@ static int wm899x_outpga_put_volsw_vu(struct snd_kcontrol *kcontrol, } #define SOC_WM899X_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 = wm899x_outpga_put_volsw_vu, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } + tlv_array) \ + SOC_SINGLE_EXT_TLV(xname, reg, shift, max, invert, \ + snd_soc_get_volsw, wm899x_outpga_put_volsw_vu, tlv_array) static const char *wm8990_digital_sidetone[] = |