diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-30 13:42:24 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-30 13:42:24 +0200 |
| commit | e4ca49d5d832c3eff23a44aacf21387629b1207b (patch) | |
| tree | 997849dbb46b424ff52604b0345bf1267054310f /sound/soc/codecs/wm8994.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-e4ca49d5d832c3eff23a44aacf21387629b1207b.tar.xz linux-e4ca49d5d832c3eff23a44aacf21387629b1207b.zip | |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
| -rw-r--r-- | sound/soc/codecs/wm8994.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 29e95f93d482..9e13edd81292 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c @@ -289,10 +289,8 @@ static const DECLARE_TLV_DB_SCALE(ng_tlv, -10200, 600, 0); static const DECLARE_TLV_DB_SCALE(mixin_boost_tlv, 0, 900, 0); #define WM8994_DRC_SWITCH(xname, reg, shift) \ -{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ - .info = snd_soc_info_volsw, .get = snd_soc_get_volsw,\ - .put = wm8994_put_drc_sw, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, 1, 0) } + SOC_SINGLE_EXT(xname, reg, shift, 1, 0, \ + snd_soc_get_volsw, wm8994_put_drc_sw) static int wm8994_put_drc_sw(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) @@ -1432,10 +1430,8 @@ SOC_DAPM_SINGLE("AIF1.1 Switch", WM8994_DAC2_RIGHT_MIXER_ROUTING, }; #define WM8994_CLASS_W_SWITCH(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 = wm8994_put_class_w, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } + SOC_SINGLE_EXT(xname, reg, shift, max, invert, \ + snd_soc_get_volsw, wm8994_put_class_w) static int wm8994_put_class_w(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |