ASoC: mediatek: mt8188: Simplify with snd_ctl_find_id_mixer()

Replace an open code with the new snd_ctl_find_id_mixer().
There is no functional change.

Acked-by: Mark Brown <broonie@kernel.org>
Cc: Trevor Wu <trevor.wu@mediatek.com>
Link: https://lore.kernel.org/r/20230720082108.31346-11-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
index ac69c23e0da1c02fcd23712b35ea08bb3613ff99..6ebcc9497ea0f62e9793ce9a7ae5b35215bb0ce5 100644 (file)
--- a/sound/soc/mediatek/mt8188/mt8188-mt6359.c
+++ b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
@@ -969,16 +969,6 @@ static struct snd_soc_dai_link mt8188_mt6359_dai_links[] = {
        },
 };
 
-static struct snd_kcontrol *ctl_find(struct snd_card *card, const char *name)
-{
-       struct snd_ctl_elem_id sid;
-
-       memset(&sid, 0, sizeof(sid));
-       strcpy(sid.name, name);
-       sid.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       return snd_ctl_find_id(card, &sid);
-}
-
 static void mt8188_fixup_controls(struct snd_soc_card *card)
 {
        struct mt8188_mt6359_priv *priv = snd_soc_card_get_drvdata(card);
@@ -995,7 +985,7 @@ static void mt8188_fixup_controls(struct snd_soc_card *card)
                        snd_soc_dapm_free_widget(w);
                }
 
-               kctl = ctl_find(card->snd_card, "Headphone Switch");
+               kctl = snd_ctl_find_id_mixer(card->snd_card, "Headphone Switch");
                if (kctl)
                        snd_ctl_remove(card->snd_card, kctl);
                else