From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Jun 2011 13:10:28 +0000 (+0200)
Subject: ALSA: hda - Remove NID_MAPPING hacks in patch_via.c
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=47be05ce0a634779e1e86ec318a046f43dd6c602;p=deliverable%2Flinux.git

ALSA: hda - Remove NID_MAPPING hacks in patch_via.c

There is no longer virtual kmixer element for NID mapping.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index adb04c1c7053..6b4a6b7a6c7a 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -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);