mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-14 06:35:12 +00:00
Code Issues Releases Wiki Activity

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

Browse source 
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: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2017-05-10 12:04:08 +02:00
parent 52204718b1
commit a717777dbf
1 changed files with 28 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sound/pci/hda/patch_realtek.c
View file

@ -2573,18 +2573,37 @@ static int patch_alc262(struct hda_codec *codec)
* ALC268 * ALC268
*/ */
/* bind Beep switches of both NID 0x0f and 0x10 */ /* bind Beep switches of both NID 0x0f and 0x10 */
static const struct hda_bind_ctls alc268_bind_beep_sw = { static int alc268_beep_switch_put(struct snd_kcontrol *kcontrol,
.ops = &snd_hda_bind_sw, struct snd_ctl_elem_value *ucontrol)
.values = { {
HDA_COMPOSE_AMP_VAL(0x0f, 3, 1, HDA_INPUT), struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
HDA_COMPOSE_AMP_VAL(0x10, 3, 1, HDA_INPUT), unsigned long pval;
0 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[] = { static const struct snd_kcontrol_new alc268_beep_mixer[] = {
HDA_CODEC_VOLUME("Beep Playback Volume", 0x1d, 0x0, HDA_INPUT), 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)
},
{ } { }
}; };