ALSA: ac97: Use the standard snd_ctl_add_followers() helper
authorTakashi Iwai <tiwai@suse.de>
Fri, 21 Jul 2023 07:16:41 +0000 (09:16 +0200)
committerTakashi Iwai <tiwai@suse.de>
Fri, 21 Jul 2023 07:37:48 +0000 (09:37 +0200)
Instead of open-code, use the new standard helper to manage vmaster
stuff for code simplification.

Except for a debug print, there should be no functional change.

Link: https://lore.kernel.org/r/20230721071643.3631-3-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/ac97/ac97_patch.c

index ccfd9c7..1d786bd 100644 (file)
@@ -3440,7 +3440,6 @@ static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
                                const char * const *followers)
 {
        struct snd_kcontrol *kctl;
-       const char * const *s;
        int err;
 
        kctl = snd_ctl_make_virtual_master(name, tlv);
@@ -3450,20 +3449,7 @@ static int snd_ac97_add_vmaster(struct snd_ac97 *ac97, char *name,
        if (err < 0)
                return err;
 
-       for (s = followers; *s; s++) {
-               struct snd_kcontrol *sctl;
-
-               sctl = snd_ac97_find_mixer_ctl(ac97, *s);
-               if (!sctl) {
-                       dev_dbg(ac97->bus->card->dev,
-                               "Cannot find follower %s, skipped\n", *s);
-                       continue;
-               }
-               err = snd_ctl_add_follower(kctl, sctl);
-               if (err < 0)
-                       return err;
-       }
-       return 0;
+       return snd_ctl_add_followers(ac97->bus->card, kctl, followers);
 }
 
 static int patch_vt1616_specific(struct snd_ac97 * ac97)