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

ASoC: codecs: wcd9335: Handle component name prefix 



Use snd_soc_dapm_widget_name_cmp() helper when comparing widget names,
to include also the component's name prefix.

Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20231023095428.166563-9-krzysztof.kozlowski@linaro.org


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

sound/soc/codecs/wcd9335.c

+9 −9
Original line number Diff line number Diff line
@@ -3296,31 +3296,31 @@ static int wcd9335_codec_enable_interpolator(struct snd_soc_dapm_widget *w, 
	int val;

	int offset_val = 0;



	if (!(strcmp(w->name, "RX INT0 INTERP"))) {

	if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT0 INTERP"))) {

		reg = WCD9335_CDC_RX0_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX0_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT1 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT1 INTERP"))) {

		reg = WCD9335_CDC_RX1_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX1_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT2 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT2 INTERP"))) {

		reg = WCD9335_CDC_RX2_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX2_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT3 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT3 INTERP"))) {

		reg = WCD9335_CDC_RX3_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX3_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT4 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT4 INTERP"))) {

		reg = WCD9335_CDC_RX4_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX4_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT5 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT5 INTERP"))) {

		reg = WCD9335_CDC_RX5_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX5_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT6 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT6 INTERP"))) {

		reg = WCD9335_CDC_RX6_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX6_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT7 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT7 INTERP"))) {

		reg = WCD9335_CDC_RX7_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX7_RX_VOL_CTL;

	} else if (!(strcmp(w->name, "RX INT8 INTERP"))) {

	} else if (!(snd_soc_dapm_widget_name_cmp(w, "RX INT8 INTERP"))) {

		reg = WCD9335_CDC_RX8_RX_PATH_CTL;

		gain_reg = WCD9335_CDC_RX8_RX_VOL_CTL;

	} else {