ASoC: Replace remaining use of *_volsw_2r with *_volsw
The snd_soc_*_volsw_2r functionality has been merged to *volsw callbacks. Few places still used the get, or put variant of volsw_2r, replace those with the corresponding *_volsw. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:

committed by
Mark Brown

orang tua
9a185b9aba
melakukan
c4671a9585
@@ -213,7 +213,7 @@ static int wm8580_out_vu(struct snd_kcontrol *kcontrol,
|
||||
reg_cache[reg] = 0;
|
||||
reg_cache[reg2] = 0;
|
||||
|
||||
ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);
|
||||
ret = snd_soc_put_volsw(kcontrol, ucontrol);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
@@ -228,15 +228,15 @@ static const struct snd_kcontrol_new wm8580_snd_controls[] = {
|
||||
SOC_DOUBLE_R_EXT_TLV("DAC1 Playback Volume",
|
||||
WM8580_DIGITAL_ATTENUATION_DACL1,
|
||||
WM8580_DIGITAL_ATTENUATION_DACR1,
|
||||
0, 0xff, 0, snd_soc_get_volsw_2r, wm8580_out_vu, dac_tlv),
|
||||
0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
|
||||
SOC_DOUBLE_R_EXT_TLV("DAC2 Playback Volume",
|
||||
WM8580_DIGITAL_ATTENUATION_DACL2,
|
||||
WM8580_DIGITAL_ATTENUATION_DACR2,
|
||||
0, 0xff, 0, snd_soc_get_volsw_2r, wm8580_out_vu, dac_tlv),
|
||||
0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
|
||||
SOC_DOUBLE_R_EXT_TLV("DAC3 Playback Volume",
|
||||
WM8580_DIGITAL_ATTENUATION_DACL3,
|
||||
WM8580_DIGITAL_ATTENUATION_DACR3,
|
||||
0, 0xff, 0, snd_soc_get_volsw_2r, wm8580_out_vu, dac_tlv),
|
||||
0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
|
||||
|
||||
SOC_SINGLE("DAC1 Deemphasis Switch", WM8580_DAC_CONTROL3, 0, 1, 0),
|
||||
SOC_SINGLE("DAC2 Deemphasis Switch", WM8580_DAC_CONTROL3, 1, 1, 0),
|
||||
|
Reference in New Issue
Block a user