Skip to content

Commit 86cfaf9

Browse files
krzkbroonie
authored andcommitted
ASoC: mediatek: mt8192: 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> Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://lore.kernel.org/r/20231023095428.166563-16-krzysztof.kozlowski@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent d1ecaab commit 86cfaf9

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

sound/soc/mediatek/mt8192/mt8192-dai-adda.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
435435
regmap_write(afe->regmap, AFE_ADDA6_MTKAIF_CFG0,
436436
0x00010000);
437437

438-
if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0 &&
438+
if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 0 &&
439439
(afe_priv->mtkaif_chosen_phase[0] < 0 ||
440440
afe_priv->mtkaif_chosen_phase[1] < 0)) {
441441
dev_warn(afe->dev,
@@ -444,7 +444,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
444444
afe_priv->mtkaif_chosen_phase[0],
445445
afe_priv->mtkaif_chosen_phase[1]);
446446
break;
447-
} else if (strcmp(w->name, "ADDA6_MTKAIF_CFG") == 0 &&
447+
} else if (snd_soc_dapm_widget_name_cmp(w, "ADDA6_MTKAIF_CFG") == 0 &&
448448
afe_priv->mtkaif_chosen_phase[2] < 0) {
449449
dev_warn(afe->dev,
450450
"%s(), mtkaif_chosen_phase[2]:%d\n",

sound/soc/mediatek/mt8192/mt8192-dai-i2s.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -623,13 +623,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget *w,
623623

624624
switch (event) {
625625
case SND_SOC_DAPM_PRE_PMU:
626-
if (strcmp(w->name, APLL1_W_NAME) == 0)
626+
if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0)
627627
mt8192_apll1_enable(afe);
628628
else
629629
mt8192_apll2_enable(afe);
630630
break;
631631
case SND_SOC_DAPM_POST_PMD:
632-
if (strcmp(w->name, APLL1_W_NAME) == 0)
632+
if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0)
633633
mt8192_apll1_disable(afe);
634634
else
635635
mt8192_apll2_disable(afe);

0 commit comments

Comments
 (0)