diff mbox series

[10/11] ASoC: mediatek: mt8188: Simplify with snd_ctl_find_id_mixer()

Message ID 20230720082108.31346-11-tiwai@suse.de (mailing list archive)
State New, archived
Headers show
Series ALSA: Cleanup with snd_ctl_find_id_mixer() | expand

Commit Message

Takashi Iwai July 20, 2023, 8:21 a.m. UTC 
Replace an open code with the new snd_ctl_find_id_mixer().
There is no functional change.

Cc: Trevor Wu <trevor.wu@mediatek.com>
Cc: Mark Brown <broonie@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/mediatek/mt8188/mt8188-mt6359.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

Comments

Mark Brown July 20, 2023, 1:02 p.m. UTC | #1 
On Thu, Jul 20, 2023 at 10:21:07AM +0200, Takashi Iwai wrote:
> Replace an open code with the new snd_ctl_find_id_mixer().
> There is no functional change.

Acked-by: Mark Brown <broonie@kernel.org>
diff mbox series

Patch

diff --git a/sound/soc/mediatek/mt8188/mt8188-mt6359.c b/sound/soc/mediatek/mt8188/mt8188-mt6359.c
index ac69c23e0da1..6ebcc9497ea0 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