Unverified Commit d8e5fa78 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

ASoC: codecs: wcd938x: Drop no-op ADC2_BCS Disable Switch 



The "ADC2_BCS Disable Switch" control does basically nothing: sets field
in driver's private data structure which is never read again to
configure hardware.  Drop the control as it has no effect.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://msgid.link/r/20240523124808.42923-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent fe243a54

sound/soc/codecs/wcd938x.c

+0 −28
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ struct wcd938x_priv { 
	bool comp1_enable;

	bool comp2_enable;

	bool ldoh;

	bool bcs_dis;

};



static const SNDRV_CTL_TLVD_DECLARE_DB_MINMAX(ear_pa_gain, 600, -1800);
@@ -1650,31 +1649,6 @@ static int wcd938x_ldoh_put(struct snd_kcontrol *kcontrol, 
	return 1;

}



static int wcd938x_bcs_get(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);



	ucontrol->value.integer.value[0] = wcd938x->bcs_dis;



	return 0;

}



static int wcd938x_bcs_put(struct snd_kcontrol *kcontrol,

			   struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);

	struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);



	if (wcd938x->bcs_dis == ucontrol->value.integer.value[0])

		return 0;



	wcd938x->bcs_dis = ucontrol->value.integer.value[0];



	return 1;

}



static const char * const tx_mode_mux_text_wcd9380[] = {

	"ADC_INVALID", "ADC_HIFI", "ADC_LO_HIF", "ADC_NORMAL", "ADC_LP",

};
@@ -2695,8 +2669,6 @@ static const struct snd_kcontrol_new wcd938x_snd_controls[] = { 
		       wcd938x_get_swr_port, wcd938x_set_swr_port),

	SOC_SINGLE_EXT("LDOH Enable Switch", SND_SOC_NOPM, 0, 1, 0,

		       wcd938x_ldoh_get, wcd938x_ldoh_put),

	SOC_SINGLE_EXT("ADC2_BCS Disable Switch", SND_SOC_NOPM, 0, 1, 0,

		       wcd938x_bcs_get, wcd938x_bcs_put),



	SOC_SINGLE_TLV("ADC1 Volume", WCD938X_ANA_TX_CH1, 0, 20, 0, analog_gain),

	SOC_SINGLE_TLV("ADC2 Volume", WCD938X_ANA_TX_CH2, 0, 20, 0, analog_gain),