]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ALSA: hda - Remove NID_MAPPING hacks in patch_via.c
authorTakashi Iwai <tiwai@suse.de>
Mon, 20 Jun 2011 13:10:28 +0000 (15:10 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 20 Jun 2011 14:24:16 +0000 (16:24 +0200)
There is no longer virtual kmixer element for NID mapping.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_via.c

index adb04c1c705318e17f35942dd5a3c82a2e25a87e..6b4a6b7a6c7adffc59be6519d59714f146e180e6 100644 (file)
@@ -54,8 +54,6 @@
 #include "hda_codec.h"
 #include "hda_local.h"
 
-#define NID_MAPPING            (-1)
-
 /* Pin Widget NID */
 #define VT1708_HP_PIN_NID      0x20
 #define VT1708_CD_PIN_NID      0x24
@@ -1279,7 +1277,6 @@ static int via_build_controls(struct hda_codec *codec)
 {
        struct via_spec *spec = codec->spec;
        struct snd_kcontrol *kctl;
-       const struct snd_kcontrol_new *knew;
        int err, i;
 
        if (spec->set_widgets_power_state)
@@ -1335,19 +1332,6 @@ static int via_build_controls(struct hda_codec *codec)
                        return err;
        }
 
-       /* other nid->control mapping */
-       for (i = 0; i < spec->num_mixers; i++) {
-               for (knew = spec->mixers[i]; knew->name; knew++) {
-                       if (knew->iface != NID_MAPPING)
-                               continue;
-                       kctl = snd_hda_find_mixer_ctl(codec, knew->name);
-                       if (kctl == NULL)
-                               continue;
-                       err = snd_hda_add_nid(codec, kctl, 0,
-                                             knew->subdevice);
-               }
-       }
-
        /* init power states */
        set_widgets_power_state(codec);
        analog_low_current_mode(codec, 1);