dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Takashi Iwai 2011-06-17 14:55:02 +02:00
parent b13e552d37
commit 5f4b36d64d
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/pci/hda/patch_via.c
View File

@ -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;
}
}