diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-06-20 09:10:28 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-06-20 10:24:16 -0400 |
commit | 47be05ce0a634779e1e86ec318a046f43dd6c602 (patch) | |
tree | cd2f9329d8c4523e3b4ebdd1c879e63e4c4e8c2f /sound/pci | |
parent | c6191607871776e828b8bc47b944d0c425776951 (diff) |
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>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_via.c | 16 |
1 files changed, 0 insertions, 16 deletions
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 @@ | |||
54 | #include "hda_codec.h" | 54 | #include "hda_codec.h" |
55 | #include "hda_local.h" | 55 | #include "hda_local.h" |
56 | 56 | ||
57 | #define NID_MAPPING (-1) | ||
58 | |||
59 | /* Pin Widget NID */ | 57 | /* Pin Widget NID */ |
60 | #define VT1708_HP_PIN_NID 0x20 | 58 | #define VT1708_HP_PIN_NID 0x20 |
61 | #define VT1708_CD_PIN_NID 0x24 | 59 | #define VT1708_CD_PIN_NID 0x24 |
@@ -1279,7 +1277,6 @@ static int via_build_controls(struct hda_codec *codec) | |||
1279 | { | 1277 | { |
1280 | struct via_spec *spec = codec->spec; | 1278 | struct via_spec *spec = codec->spec; |
1281 | struct snd_kcontrol *kctl; | 1279 | struct snd_kcontrol *kctl; |
1282 | const struct snd_kcontrol_new *knew; | ||
1283 | int err, i; | 1280 | int err, i; |
1284 | 1281 | ||
1285 | if (spec->set_widgets_power_state) | 1282 | if (spec->set_widgets_power_state) |
@@ -1335,19 +1332,6 @@ static int via_build_controls(struct hda_codec *codec) | |||
1335 | return err; | 1332 | return err; |
1336 | } | 1333 | } |
1337 | 1334 | ||
1338 | /* other nid->control mapping */ | ||
1339 | for (i = 0; i < spec->num_mixers; i++) { | ||
1340 | for (knew = spec->mixers[i]; knew->name; knew++) { | ||
1341 | if (knew->iface != NID_MAPPING) | ||
1342 | continue; | ||
1343 | kctl = snd_hda_find_mixer_ctl(codec, knew->name); | ||
1344 | if (kctl == NULL) | ||
1345 | continue; | ||
1346 | err = snd_hda_add_nid(codec, kctl, 0, | ||
1347 | knew->subdevice); | ||
1348 | } | ||
1349 | } | ||
1350 | |||
1351 | /* init power states */ | 1335 | /* init power states */ |
1352 | set_widgets_power_state(codec); | 1336 | set_widgets_power_state(codec); |
1353 | analog_low_current_mode(codec, 1); | 1337 | analog_low_current_mode(codec, 1); |