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/wm_hubs.c | |
parent | fbc6c4ee659da5bdd49ab85c5d7e50c51db1b4fa (diff) | |
parent | f0ddb219c9f92d0c43582a000e1ddc0a4ee43222 (diff) | |
download | op-kernel-dev-e4ca49d5d832c3eff23a44aacf21387629b1207b.zip op-kernel-dev-e4ca49d5d832c3eff23a44aacf21387629b1207b.tar.gz |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
-rw-r--r-- | sound/soc/codecs/wm_hubs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index f5d81b9..2d9e099 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c @@ -693,10 +693,8 @@ void wm_hubs_update_class_w(struct snd_soc_codec *codec) EXPORT_SYMBOL_GPL(wm_hubs_update_class_w); #define WM_HUBS_SINGLE_W(xname, reg, shift, max, invert) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_volsw, \ - .get = snd_soc_dapm_get_volsw, .put = class_w_put_volsw, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } + SOC_SINGLE_EXT(xname, reg, shift, max, invert, \ + snd_soc_dapm_get_volsw, class_w_put_volsw) static int class_w_put_volsw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |