Merge tag 'pstore-v6.6-rc1-fix' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / sound / pci / maestro3.c

diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c
index 2618507..305cbd2 100644 (file)
--- a/sound/pci/maestro3.c
+++ b/sound/pci/maestro3.c
@@ -2029,9 +2029,6 @@ static int snd_m3_mixer(struct snd_m3 *chip)
 {
        struct snd_ac97_bus *pbus;
        struct snd_ac97_template ac97;
-#ifndef CONFIG_SND_MAESTRO3_INPUT
-       struct snd_ctl_elem_id elem_id;
-#endif
        int err;
        static const struct snd_ac97_bus_ops ops = {
                .write = snd_m3_ac97_write,
@@ -2054,14 +2051,10 @@ static int snd_m3_mixer(struct snd_m3 *chip)
        snd_ac97_write(chip->ac97, AC97_PCM, 0);
 
 #ifndef CONFIG_SND_MAESTRO3_INPUT
-       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;