diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-06-28 13:36:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-06-28 13:36:22 +0200 |
| commit | accaf69da1d1e64bd77ac0caad77e4cfc3b654c7 (patch) | |
| tree | 0402e4fad9cecd428c8c3c228a08f9e31eb63470 /sound/soc/codecs/tlv320aic3x.c | |
| parent | ALSA: Replace the magic number 44 with const (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/x86' into asoc-next (diff) | |
| download | linux-accaf69da1d1e64bd77ac0caad77e4cfc3b654c7.tar.xz linux-accaf69da1d1e64bd77ac0caad77e4cfc3b654c7.zip | |
Merge tag 'asoc-v3.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: More updates for v3.11
Some more fixes and enhancements, and also a bunch of refectoring for
AC'97 support which enables more than one AC'97 controller driver to be
built in.
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, |