Commit c4671a95 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 9a185b9a

sound/soc/codecs/wm8350.c

+2 −2
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ static int wm8350_put_volsw_2r_vu(struct snd_kcontrol *kcontrol, 
			return 1;

	}



	ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);

	ret = snd_soc_put_volsw(kcontrol, ucontrol);

	if (ret < 0)

		return ret;
@@ -392,7 +392,7 @@ static int wm8350_get_volsw_2r(struct snd_kcontrol *kcontrol, 
		break;

	}



	return snd_soc_get_volsw_2r(kcontrol, ucontrol);

	return snd_soc_get_volsw(kcontrol, ucontrol);

}



static const char *wm8350_deemp[] = { "None", "32kHz", "44.1kHz", "48kHz" };

sound/soc/codecs/wm8580.c

+4 −4
Original line number Diff line number Diff line
@@ -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),

sound/soc/codecs/wm_hubs.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol, 
	struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec);

	int ret;



	ret = snd_soc_put_volsw_2r(kcontrol, ucontrol);

	ret = snd_soc_put_volsw(kcontrol, ucontrol);



	/* Updating the analogue gains invalidates the DC servo cache */

	hubs->class_w_dcs = 0;
@@ -364,7 +364,7 @@ SOC_ENUM("Speaker Mode", speaker_mode), 


SOC_DOUBLE_R_EXT_TLV("Headphone Volume",

		     WM8993_LEFT_OUTPUT_VOLUME, WM8993_RIGHT_OUTPUT_VOLUME,

		     0, 63, 0, snd_soc_get_volsw_2r, wm8993_put_dc_servo,

		     0, 63, 0, snd_soc_get_volsw, wm8993_put_dc_servo,

		     outpga_tlv),



SOC_DOUBLE_R("Headphone Switch", WM8993_LEFT_OUTPUT_VOLUME,

CRA Git | Maintained and supported by SUSTech CRA and CCSE