From: Takashi Iwai Date: Thu, 20 Jul 2023 08:21:07 +0000 (+0200) Subject: ASoC: mediatek: mt8188: Simplify with snd_ctl_find_id_mixer() X-Git-Tag: kvm-x86-next-2023.09.07~103^2~5^2~104 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ca141fe31df06fd5769e3d1d41e2a7b68b308243;p=users%2Fdwmw2%2Flinux.git 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 Cc: Trevor Wu Link: https://lore.kernel.org/r/20230720082108.31346-11-tiwai@suse.de Signed-off-by: Takashi Iwai --- diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c index ac69c23e0da1c..6ebcc9497ea0f 100644 --- 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