diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-12-18 08:29:52 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-12 02:30:32 -0500 |
commit | 480967db6c5ac0c2cd4582a73ee8aaaffda66d51 (patch) | |
tree | 1af99094c02835f6520ad972919bb3270a4eca42 /sound/pci/hda/patch_realtek.c | |
parent | 37c042076521a854239241eaac94788076046231 (diff) |
ALSA: hda/realtek - Drop auto_mic_valid_imux flag
This flag is superfluous now and it's always as same as
spec->auto_mic. Let's drop.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index c6cc833f4d2a..e3fe7350b359 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -209,7 +209,6 @@ struct alc_spec { | |||
209 | unsigned int line_jack_present:1; | 209 | unsigned int line_jack_present:1; |
210 | unsigned int master_mute:1; | 210 | unsigned int master_mute:1; |
211 | unsigned int auto_mic:1; | 211 | unsigned int auto_mic:1; |
212 | unsigned int auto_mic_valid_imux:1; /* valid imux for auto-mic */ | ||
213 | unsigned int automute_speaker:1; /* automute speaker outputs */ | 212 | unsigned int automute_speaker:1; /* automute speaker outputs */ |
214 | unsigned int automute_lo:1; /* automute LO outputs */ | 213 | unsigned int automute_lo:1; /* automute LO outputs */ |
215 | unsigned int detect_hp:1; /* Headphone detection enabled */ | 214 | unsigned int detect_hp:1; /* Headphone detection enabled */ |
@@ -622,7 +621,7 @@ static void alc_mic_automute(struct hda_codec *codec, struct hda_jack_tbl *jack) | |||
622 | struct alc_spec *spec = codec->spec; | 621 | struct alc_spec *spec = codec->spec; |
623 | hda_nid_t *pins = spec->imux_pins; | 622 | hda_nid_t *pins = spec->imux_pins; |
624 | 623 | ||
625 | if (!spec->auto_mic || !spec->auto_mic_valid_imux) | 624 | if (!spec->auto_mic) |
626 | return; | 625 | return; |
627 | if (snd_BUG_ON(spec->int_mic_idx < 0 || spec->ext_mic_idx < 0)) | 626 | if (snd_BUG_ON(spec->int_mic_idx < 0 || spec->ext_mic_idx < 0)) |
628 | return; | 627 | return; |
@@ -1004,8 +1003,6 @@ static bool alc_auto_mic_check_imux(struct hda_codec *codec) | |||
1004 | snd_hda_jack_detect_enable_callback(codec, spec->dock_mic_pin, | 1003 | snd_hda_jack_detect_enable_callback(codec, spec->dock_mic_pin, |
1005 | ALC_MIC_EVENT, | 1004 | ALC_MIC_EVENT, |
1006 | alc_mic_automute); | 1005 | alc_mic_automute); |
1007 | |||
1008 | spec->auto_mic_valid_imux = 1; | ||
1009 | return true; | 1006 | return true; |
1010 | } | 1007 | } |
1011 | 1008 | ||