renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 06:34:11 +08:00
Code

ALSA: hda - Use cached version for changing pins in hda_generic.c

Browse Source 
There is no reason to avoid snd_hda_set_pin_ctl_cache() there.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-12-20 15:38:40 +01:00
parent d5a9f1bb38
commit 7594aa3396
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sound/pci/hda/hda_generic.c
View File

@ -1572,11 +1572,12 @@ static void update_shared_mic_hp(struct hda_codec *codec, bool set_as_mic)
const hda_nid_t vref_pin = spec->shared_mic_vref_pin; const hda_nid_t vref_pin = spec->shared_mic_vref_pin;
unsigned int vref_val = snd_hda_get_default_vref(codec, vref_pin); unsigned int vref_val = snd_hda_get_default_vref(codec, vref_pin);
if (vref_val != AC_PINCTL_VREF_HIZ) if (vref_val != AC_PINCTL_VREF_HIZ)
snd_hda_set_pin_ctl(codec, vref_pin, PIN_IN | (set_as_mic ? vref_val : 0)); snd_hda_set_pin_ctl_cache(codec, vref_pin,
PIN_IN | (set_as_mic ? vref_val : 0));
} }
val = set_as_mic ? val | PIN_IN : PIN_HP; val = set_as_mic ? val | PIN_IN : PIN_HP;
snd_hda_set_pin_ctl(codec, pin, val); snd_hda_set_pin_ctl_cache(codec, pin, val);
spec->automute_speaker = !set_as_mic; spec->automute_speaker = !set_as_mic;
call_update_outputs(codec); call_update_outputs(codec);
@ -2431,7 +2432,7 @@ static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
} else } else
val = 0; val = 0;
val |= pin_bits; val |= pin_bits;
snd_hda_set_pin_ctl(codec, nid, val); snd_hda_set_pin_ctl_cache(codec, nid, val);
set_pin_eapd(codec, nid, !mute); set_pin_eapd(codec, nid, !mute);
} }
} }
@ -3467,7 +3468,7 @@ static void set_input_pin(struct hda_codec *codec, hda_nid_t nid,
unsigned int val = PIN_IN; unsigned int val = PIN_IN;
if (auto_pin_type == AUTO_PIN_MIC) if (auto_pin_type == AUTO_PIN_MIC)
val |= snd_hda_get_default_vref(codec, nid); val |= snd_hda_get_default_vref(codec, nid);
snd_hda_set_pin_ctl(codec, nid, val); snd_hda_set_pin_ctl_cache(codec, nid, val);
} }
/* set up input pins and loopback paths */ /* set up input pins and loopback paths */
@ -3541,7 +3542,7 @@ static void init_digital(struct hda_codec *codec)
} }
pin = spec->autocfg.dig_in_pin; pin = spec->autocfg.dig_in_pin;
if (pin) if (pin)
snd_hda_set_pin_ctl(codec, pin, PIN_IN); snd_hda_set_pin_ctl_cache(codec, pin, PIN_IN);
} }
/* clear unsol-event tags on unused pins; Conexant codecs seem to leave /* clear unsol-event tags on unused pins; Conexant codecs seem to leave