Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH 03/11] ALSA: cs46xx: Simplify with snd_ctl_find_id_mixer()
Date: Thu, 20 Jul 2023 10:21:00 +0200	[thread overview]
Message-ID: <20230720082108.31346-4-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.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/cs46xx/cs46xx_lib.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/sound/pci/cs46xx/cs46xx_lib.c b/sound/pci/cs46xx/cs46xx_lib.c
index 7d882b33d45e..f3a94bb537bd 100644
--- a/sound/pci/cs46xx/cs46xx_lib.c
+++ b/sound/pci/cs46xx/cs46xx_lib.c
@@ -2449,7 +2449,6 @@ static int cs46xx_detect_codec(struct snd_cs46xx *chip, int codec)
 int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)
 {
 	struct snd_card *card = chip->card;
-	struct snd_ctl_elem_id id;
 	int err;
 	unsigned int idx;
 	static const struct snd_ac97_bus_ops ops = {
@@ -2490,10 +2489,8 @@ int snd_cs46xx_mixer(struct snd_cs46xx *chip, int spdif_device)
 	}
 
 	/* get EAPD mixer switch (for voyetra hack) */
-	memset(&id, 0, sizeof(id));
-	id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-	strcpy(id.name, "External Amplifier");
-	chip->eapd_switch = snd_ctl_find_id(chip->card, &id);
+	chip->eapd_switch = snd_ctl_find_id_mixer(chip->card,
+						  "External Amplifier");
     
 #ifdef CONFIG_SND_CS46XX_NEW_DSP
 	if (chip->nr_ac97_codecs == 1) {
-- 
2.35.3


  parent reply	other threads:[~2023-07-20  8:23 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 ` Takashi Iwai [this message]
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 ` [PATCH 10/11] ASoC: mediatek: mt8188: " Takashi Iwai
2023-07-20 13:02   ` 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-4-tiwai@suse.de \
    --to=tiwai@suse.de \
    --cc=alsa-devel@alsa-project.org \
    /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