Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f4b36d6 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

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: default avatarTakashi Iwai <tiwai@suse.de>
parent b13e552d

sound/pci/hda/patch_via.c

+9 −18
Original line number Original line Diff line number Diff line
@@ -1003,19 +1003,13 @@ static int via_smart51_put(struct snd_kcontrol *kcontrol, 
	return 1;

	return 1;

}

}





static const struct snd_kcontrol_new via_smart51_mixer[2] = {

static const struct snd_kcontrol_new via_smart51_mixer = {

	{

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

	.name = "Smart 5.1",

	.name = "Smart 5.1",

	.count = 1,

	.count = 1,

	.info = via_smart51_info,

	.info = via_smart51_info,

	.get = via_smart51_get,

	.get = via_smart51_get,

	.put = via_smart51_put,

	.put = via_smart51_put,

	 },

	{

	 .iface = NID_MAPPING,

	 .name = "Smart 5.1",

	}

};

};





static int via_smart51_build(struct via_spec *spec)

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)

	if (cfg->line_outs > 2)

		return 0;

		return 0;





	knew = via_clone_control(spec, &via_smart51_mixer[0]);

	knew = via_clone_control(spec, &via_smart51_mixer);

	if (knew == NULL)

	if (knew == NULL)

		return -ENOMEM;

		return -ENOMEM;





	for (i = 0; i < cfg->num_inputs; i++) {

	for (i = 0; i < cfg->num_inputs; i++) {

		nid = cfg->inputs[i].pin;

		nid = cfg->inputs[i].pin;

		if (cfg->inputs[i].type <= AUTO_PIN_LINE_IN) {

		if (cfg->inputs[i].type <= AUTO_PIN_LINE_IN) {

			knew = via_clone_control(spec, &via_smart51_mixer[1]);

			knew->subdevice = HDA_SUBDEV_NID_FLAG | nid;

			if (knew == NULL)

				return -ENOMEM;

			knew->subdevice = nid;

			break;

			break;

		}

		}

	}

	}