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

Commit a717777d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: hda - Simplify bound-beep mute control for ALC268 



The beep mute switch for ALC268 needs to touch two NIDs, and we used
to apply the bind-mixer stuff.  But the use case for ALC268 is fairly
easy to convert to an open-code in a shorter form.  Since this is the
only user of the bind-ctls, we can clean up the common helper codes
later.

Reviewed-by: default avatarTakashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 52204718

sound/pci/hda/patch_realtek.c

+28 −9
Original line number Diff line number Diff line
@@ -2573,18 +2573,37 @@ static int patch_alc262(struct hda_codec *codec) 
 *  ALC268

 */

/* bind Beep switches of both NID 0x0f and 0x10 */

static const struct hda_bind_ctls alc268_bind_beep_sw = {

	.ops = &snd_hda_bind_sw,

	.values = {

		HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT),

		HDA_COMPOSE_AMP_VAL(0x10, 3, 1, HDA_INPUT),

		0

	},

};

static int alc268_beep_switch_put(struct snd_kcontrol *kcontrol,

				  struct snd_ctl_elem_value *ucontrol)

{

	struct hda_codec *codec = snd_kcontrol_chip(kcontrol);

	unsigned long pval;

	int err;



	mutex_lock(&codec->control_mutex);

	pval = kcontrol->private_value;

	kcontrol->private_value = (pval & ~0xff) | 0x0f;

	err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);

	if (err >= 0) {

		kcontrol->private_value = (pval & ~0xff) | 0x10;

		err = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol);

	}

	kcontrol->private_value = pval;

	mutex_unlock(&codec->control_mutex);

	return err;

}



static const struct snd_kcontrol_new alc268_beep_mixer[] = {

	HDA_CODEC_VOLUME("Beep Playback Volume", 0x1d, 0x0, HDA_INPUT),

	HDA_BIND_SW("Beep Playback Switch", &alc268_bind_beep_sw),

	{

		.iface = SNDRV_CTL_ELEM_IFACE_MIXER,

		.name = "Beep Playback Switch",

		.subdevice = HDA_SUBDEV_AMP_FLAG,

		.info = snd_hda_mixer_amp_switch_info,

		.get = snd_hda_mixer_amp_switch_get,

		.put = alc268_beep_switch_put,

		.private_value = HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT)

	},

	{ }

};