ASoC: mediatek: mt8186: 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-14-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
index 247ab8df941f7b56294d651d458c0898ee508c0c..85ae3f76d9510d5f7514888c00db6b98e4461ca9 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
+++ b/sound/soc/mediatek/mt8186/mt8186-dai-adda.c
@@ -321,7 +321,7 @@ static int mtk_adda_mtkaif_cfg_event(struct snd_soc_dapm_widget *w,
                                           MTKAIF_RXIF_CLKINV_ADC_MASK_SFT,
                                           BIT(MTKAIF_RXIF_CLKINV_ADC_SFT));
 
-                       if (strcmp(w->name, "ADDA_MTKAIF_CFG") == 0) {
+                       if (snd_soc_dapm_widget_name_cmp(w, "ADDA_MTKAIF_CFG") == 0) {
                                if (afe_priv->mtkaif_chosen_phase[0] < 0 &&
                                    afe_priv->mtkaif_chosen_phase[1] < 0) {
                                        dev_err(afe->dev,

diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c b/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c
index 33edd6cbde128ec3729c961d8432a57eb5001c66..75cb30790b1b1f80b2d0133571ad634dcd638927 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c
+++ b/sound/soc/mediatek/mt8186/mt8186-dai-hw-gain.c
@@ -47,7 +47,7 @@ static int mtk_hw_gain_event(struct snd_soc_dapm_widget *w,
 
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
-               if (strcmp(w->name, HW_GAIN_1_EN_W_NAME) == 0) {
+               if (snd_soc_dapm_widget_name_cmp(w, HW_GAIN_1_EN_W_NAME) == 0) {
                        gain_cur = AFE_GAIN1_CUR;
                        gain_con1 = AFE_GAIN1_CON1;
                } else {

diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c b/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
index f07181be4370d948b13c47edd9413003885a9727..7c40212219500065fc69ae35758de07c27e59529 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
+++ b/sound/soc/mediatek/mt8186/mt8186-dai-i2s.c
@@ -393,13 +393,13 @@ static int mtk_apll_event(struct snd_soc_dapm_widget *w,
 
        switch (event) {
        case SND_SOC_DAPM_PRE_PMU:
-               if (strcmp(w->name, APLL1_W_NAME) == 0)
+               if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0)
                        mt8186_apll1_enable(afe);
                else
                        mt8186_apll2_enable(afe);
                break;
        case SND_SOC_DAPM_POST_PMD:
-               if (strcmp(w->name, APLL1_W_NAME) == 0)
+               if (snd_soc_dapm_widget_name_cmp(w, APLL1_W_NAME) == 0)
                        mt8186_apll1_disable(afe);
                else
                        mt8186_apll2_disable(afe);

diff --git a/sound/soc/mediatek/mt8186/mt8186-dai-src.c b/sound/soc/mediatek/mt8186/mt8186-dai-src.c
index 67989ffd67ca9946c09ba6b056166efa3aa03ae9..e475f4591aef51ca959253a78a7c691eea18c345 100644 (file)
--- a/sound/soc/mediatek/mt8186/mt8186-dai-src.c
+++ b/sound/soc/mediatek/mt8186/mt8186-dai-src.c
@@ -322,7 +322,7 @@ static int mtk_hw_src_event(struct snd_soc_dapm_widget *w,
        struct mtk_afe_src_priv *src_priv;
        unsigned int reg;
 
-       if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0)
+       if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0)
                id = MT8186_DAI_SRC_1;
        else
                id = MT8186_DAI_SRC_2;
@@ -487,7 +487,7 @@ static int mtk_afe_src_en_connect(struct snd_soc_dapm_widget *source,
        struct mt8186_afe_private *afe_priv = afe->platform_priv;
        struct mtk_afe_src_priv *src_priv;
 
-       if (strcmp(w->name, HW_SRC_1_EN_W_NAME) == 0)
+       if (snd_soc_dapm_widget_name_cmp(w, HW_SRC_1_EN_W_NAME) == 0)
                src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_1];
        else
                src_priv = afe_priv->dai_priv[MT8186_DAI_SRC_2];