diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-28 15:17:05 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-28 15:17:05 +0400 |
| commit | b078dcee9a58449741cd401f2ca666dd699512f6 (patch) | |
| tree | a7f2d1596b3332136b429b619e29728d508a88b1 /sound/soc/codecs/tlv320aic3x.c | |
| parent | 71ce221b729959955c80a99f9ff2e62261df6394 (diff) | |
| parent | f0ddb219c9f92d0c43582a000e1ddc0a4ee43222 (diff) | |
| download | linux-b078dcee9a58449741cd401f2ca666dd699512f6.tar.xz | |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/tlv320aic3x.c')
| -rw-r--r-- | sound/soc/codecs/tlv320aic3x.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/tlv320aic3x.c b/sound/soc/codecs/tlv320aic3x.c index 1514bf845e4b..e5b926883131 100644 --- a/sound/soc/codecs/tlv320aic3x.c +++ b/sound/soc/codecs/tlv320aic3x.c @@ -128,10 +128,8 @@ static const u8 aic3x_reg[AIC3X_CACHEREGNUM] = { }; #define SOC_DAPM_SINGLE_AIC3X(xname, reg, shift, mask, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_volsw, \ - .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw_aic3x, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, mask, invert) } + SOC_SINGLE_EXT(xname, reg, shift, mask, invert, \ + snd_soc_dapm_get_volsw, snd_soc_dapm_put_volsw_aic3x) /* * All input lines are connected when !0xf and disconnected with 0xf bit field, |