diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-17 14:55:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-20 16:07:02 +0200 |
| commit | 5f4b36d64d1f1ba1da46bee3ec4f0519dfaf68e6 (patch) | |
| tree | b7dc6fd280c5d71fc4384d04591b0b10eb2cee7f /sound/pci/hda | |
| parent | b13e552d374a9cbee20ba24635608289cc8a7c97 (diff) | |
| download | op-kernel-dev-5f4b36d64d1f1ba1da46bee3ec4f0519dfaf68e6.zip op-kernel-dev-5f4b36d64d1f1ba1da46bee3ec4f0519dfaf68e6.tar.gz | |
ALSA: hda - Remove superfluous NID_MAPPING use for smart51 mixer
Just a minor clean up; nid-mapping can be set directly to the smart51
mixer element.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 89a0f2a..995974d 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c @@ -1003,19 +1003,13 @@ static int via_smart51_put(struct snd_kcontrol *kcontrol, return 1; } -static const struct snd_kcontrol_new via_smart51_mixer[2] = { - { - .iface = SNDRV_CTL_ELEM_IFACE_MIXER, - .name = "Smart 5.1", - .count = 1, - .info = via_smart51_info, - .get = via_smart51_get, - .put = via_smart51_put, - }, - { - .iface = NID_MAPPING, - .name = "Smart 5.1", - } +static const struct snd_kcontrol_new via_smart51_mixer = { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Smart 5.1", + .count = 1, + .info = via_smart51_info, + .get = via_smart51_get, + .put = via_smart51_put, }; static int via_smart51_build(struct via_spec *spec) @@ -1030,17 +1024,14 @@ static int via_smart51_build(struct via_spec *spec) if (cfg->line_outs > 2) return 0; - knew = via_clone_control(spec, &via_smart51_mixer[0]); + knew = via_clone_control(spec, &via_smart51_mixer); if (knew == NULL) return -ENOMEM; for (i = 0; i < cfg->num_inputs; i++) { nid = cfg->inputs[i].pin; if (cfg->inputs[i].type <= AUTO_PIN_LINE_IN) { - knew = via_clone_control(spec, &via_smart51_mixer[1]); - if (knew == NULL) - return -ENOMEM; - knew->subdevice = nid; + knew->subdevice = HDA_SUBDEV_NID_FLAG | nid; break; } } |
