ASoC: tegra: machine: 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: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20231023095428.166563-18-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c
index 3caadee9584f3e0425a7103f7b13ce27c9c6e1bb..192e9692bdf2edac3c7a5540ce6a7699a8296925 100644 (file)
--- a/sound/soc/tegra/tegra_asoc_machine.c
+++ b/sound/soc/tegra/tegra_asoc_machine.c
@@ -81,19 +81,23 @@ static int tegra_machine_event(struct snd_soc_dapm_widget *w,
        struct snd_soc_dapm_context *dapm = w->dapm;
        struct tegra_machine *machine = snd_soc_card_get_drvdata(dapm->card);
 
-       if (!strcmp(w->name, "Int Spk") || !strcmp(w->name, "Speakers"))
+       if (!snd_soc_dapm_widget_name_cmp(w, "Int Spk") ||
+           !snd_soc_dapm_widget_name_cmp(w, "Speakers"))
                gpiod_set_value_cansleep(machine->gpiod_spkr_en,
                                         SND_SOC_DAPM_EVENT_ON(event));
 
-       if (!strcmp(w->name, "Mic Jack") || !strcmp(w->name, "Headset Mic"))
+       if (!snd_soc_dapm_widget_name_cmp(w, "Mic Jack") ||
+           !snd_soc_dapm_widget_name_cmp(w, "Headset Mic"))
                gpiod_set_value_cansleep(machine->gpiod_ext_mic_en,
                                         SND_SOC_DAPM_EVENT_ON(event));
 
-       if (!strcmp(w->name, "Int Mic") || !strcmp(w->name, "Internal Mic 2"))
+       if (!snd_soc_dapm_widget_name_cmp(w, "Int Mic") ||
+           !snd_soc_dapm_widget_name_cmp(w, "Internal Mic 2"))
                gpiod_set_value_cansleep(machine->gpiod_int_mic_en,
                                         SND_SOC_DAPM_EVENT_ON(event));
 
-       if (!strcmp(w->name, "Headphone") || !strcmp(w->name, "Headphone Jack"))
+       if (!snd_soc_dapm_widget_name_cmp(w, "Headphone") ||
+           !snd_soc_dapm_widget_name_cmp(w, "Headphone Jack"))
                gpiod_set_value_cansleep(machine->gpiod_hp_mute,
                                         !SND_SOC_DAPM_EVENT_ON(event));