From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.de>, Trevor Wu <trevor.wu@mediatek.com>,
Mark Brown <broonie@kernel.org>
Subject: [PATCH 10/11] ASoC: mediatek: mt8188: Simplify with snd_ctl_find_id_mixer()
Date: Thu, 20 Jul 2023 10:21:07 +0200 [thread overview]
Message-ID: <20230720082108.31346-11-tiwai@suse.de> (raw)
In-Reply-To: <20230720082108.31346-1-tiwai@suse.de>
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(-)
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
--
2.35.3
next prev parent reply other threads:[~2023-07-20 8:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-20 8:20 [PATCH 00/11] ALSA: Cleanup with snd_ctl_find_id_mixer() Takashi Iwai
2023-07-20 8:20 ` [PATCH 01/11] ALSA: control: Introduce snd_ctl_find_id_mixer() Takashi Iwai
2023-07-20 8:20 ` [PATCH 02/11] ALSA: ca0106: Simplify with snd_ctl_find_id_mixer() Takashi Iwai
2023-07-20 8:21 ` [PATCH 03/11] ALSA: cs46xx: " Takashi Iwai
2023-07-20 8:21 ` [PATCH 04/11] ALSA: emu10k1: " Takashi Iwai
2023-07-20 8:21 ` [PATCH 05/11] ALSA: es1968: " Takashi Iwai
2023-07-20 8:21 ` [PATCH 06/11] ALSA: ice1712: " Takashi Iwai
2023-07-20 8:21 ` [PATCH 07/11] ALSA: maestro3: " Takashi Iwai
2023-07-20 8:21 ` [PATCH 08/11] ALSA: via82xx: " Takashi Iwai
2023-07-20 8:21 ` [PATCH 09/11] ALSA: cmipci: " Takashi Iwai
2023-07-20 8:21 ` Takashi Iwai [this message]
2023-07-20 13:02 ` [PATCH 10/11] ASoC: mediatek: mt8188: " Mark Brown
2023-07-20 8:21 ` [PATCH 11/11] ALSA: ac97: " Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230720082108.31346-11-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=trevor.wu@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox