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/wm8903.c | |
| parent | fbc6c4ee659da5bdd49ab85c5d7e50c51db1b4fa (diff) | |
| parent | f0ddb219c9f92d0c43582a000e1ddc0a4ee43222 (diff) | |
Merge remote-tracking branch 'asoc/topic/ext' into asoc-next
Diffstat (limited to 'sound/soc/codecs/wm8903.c')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 9d88437cdcd..fa24cedee68 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c @@ -403,10 +403,8 @@ static int wm8903_class_w_put(struct snd_kcontrol *kcontrol, } #define SOC_DAPM_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 = wm8903_class_w_put, \ - .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert) } + SOC_SINGLE_EXT(xname, reg, shift, max, invert, \ + snd_soc_dapm_get_volsw, wm8903_class_w_put) static int wm8903_deemph[] = { 0, 32000, 44100, 48000 }; |