From: Takashi Iwai Date: Thu, 13 Dec 2012 16:03:30 +0000 (+0100) Subject: ALSA: hda - Remove snd_hda_codec_amp_update() call from patch_*.c X-Git-Tag: firefly_0821_release~3680^2~1005^2~77^2~179 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8092e6065435d75a68873fa66cd003a1b829e0fe;p=firefly-linux-kernel-4.4.55.git ALSA: hda - Remove snd_hda_codec_amp_update() call from patch_*.c It's used only in one place in patch_analog.c, and it can be replaced with others better. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 89fc5030ec79..308a5b9e6b9d 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c @@ -995,15 +995,7 @@ static int ad1986a_hp_master_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { struct hda_codec *codec = snd_kcontrol_chip(kcontrol); - long *valp = ucontrol->value.integer.value; - int change; - - change = snd_hda_codec_amp_update(codec, 0x1a, 0, HDA_OUTPUT, 0, - HDA_AMP_MUTE, - valp[0] ? 0 : HDA_AMP_MUTE); - change |= snd_hda_codec_amp_update(codec, 0x1a, 1, HDA_OUTPUT, 0, - HDA_AMP_MUTE, - valp[1] ? 0 : HDA_AMP_MUTE); + int change = snd_hda_mixer_amp_switch_put(kcontrol, ucontrol); if (change) ad1986a_update_hp(codec); return change;