OSDN Git Service

ALSA: cs46xx: Simplify with snd_ctl_find_id_mixer()
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 Jul 2023 08:21:00 +0000 (10:21 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Jul 2023 07:10:39 +0000 (09:10 +0200)
Replace an open code with the new snd_ctl_find_id_mixer().
There is no functional change.

Link: https://lore.kernel.org/r/20230720082108.31346-4-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/cs46xx/cs46xx_lib.c

index 7d882b3..f3a94bb 100644 (file)
@@ -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) {