ALSA: es1968: Simplify with snd_ctl_find_id_mixer()
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 Jul 2023 08:21:02 +0000 (10:21 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Jul 2023 07:10:41 +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-6-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/es1968.c

index 4a7e20b..4bc0f53 100644 (file)
@@ -2005,9 +2005,6 @@ snd_es1968_mixer(struct es1968 *chip)
 {
        struct snd_ac97_bus *pbus;
        struct snd_ac97_template ac97;
-#ifndef CONFIG_SND_ES1968_INPUT
-       struct snd_ctl_elem_id elem_id;
-#endif
        int err;
        static const struct snd_ac97_bus_ops ops = {
                .write = snd_es1968_ac97_write,
@@ -2027,14 +2024,10 @@ snd_es1968_mixer(struct es1968 *chip)
 
 #ifndef CONFIG_SND_ES1968_INPUT
        /* attach master switch / volumes for h/w volume control */
-       memset(&elem_id, 0, sizeof(elem_id));
-       elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       strcpy(elem_id.name, "Master Playback Switch");
-       chip->master_switch = snd_ctl_find_id(chip->card, &elem_id);
-       memset(&elem_id, 0, sizeof(elem_id));
-       elem_id.iface = SNDRV_CTL_ELEM_IFACE_MIXER;
-       strcpy(elem_id.name, "Master Playback Volume");
-       chip->master_volume = snd_ctl_find_id(chip->card, &elem_id);
+       chip->master_switch = snd_ctl_find_id_mixer(chip->card,
+                                                   "Master Playback Switch");
+       chip->master_volume = snd_ctl_find_id_mixer(chip->card,
+                                                   "Master Playback Volume");
 #endif
 
        return 0;