diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-01-19 09:03:48 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-19 09:03:48 -0500 |
commit | a7309792c4e313d4e4c30084dc0ecbc834082433 (patch) | |
tree | e68079c828c7465d82353d053d36fc20858517c8 /sound/pci/hda/patch_realtek.c | |
parent | f21d78e2698b6380a5387461e3b126bb2dee23aa (diff) |
ALSA: hda/realtek - Remove use_jack_tbl field
Now that all quirks have the own unsol handlers, we don't need to check
use_jack_tbl flag any more. Let's kill it.
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 2326bf379525..ddbed9705ef4 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -185,7 +185,6 @@ struct alc_spec { | |||
185 | unsigned int vol_in_capsrc:1; /* use capsrc volume (ADC has no vol) */ | 185 | unsigned int vol_in_capsrc:1; /* use capsrc volume (ADC has no vol) */ |
186 | unsigned int parse_flags; /* passed to snd_hda_parse_pin_defcfg() */ | 186 | unsigned int parse_flags; /* passed to snd_hda_parse_pin_defcfg() */ |
187 | unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */ | 187 | unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */ |
188 | unsigned int use_jack_tbl:1; /* 1 for model=auto */ | ||
189 | 188 | ||
190 | /* auto-mute control */ | 189 | /* auto-mute control */ |
191 | int automute_mode; | 190 | int automute_mode; |
@@ -646,8 +645,7 @@ static void alc_sku_unsol_event(struct hda_codec *codec, unsigned int res) | |||
646 | res >>= 28; | 645 | res >>= 28; |
647 | else | 646 | else |
648 | res >>= 26; | 647 | res >>= 26; |
649 | if (spec->use_jack_tbl) | 648 | res = snd_hda_jack_get_action(codec, res); |
650 | res = snd_hda_jack_get_action(codec, res); | ||
651 | alc_exec_unsol_event(codec, res); | 649 | alc_exec_unsol_event(codec, res); |
652 | } | 650 | } |
653 | 651 | ||
@@ -3915,7 +3913,6 @@ static void set_capture_mixer(struct hda_codec *codec) | |||
3915 | static void alc_auto_init_std(struct hda_codec *codec) | 3913 | static void alc_auto_init_std(struct hda_codec *codec) |
3916 | { | 3914 | { |
3917 | struct alc_spec *spec = codec->spec; | 3915 | struct alc_spec *spec = codec->spec; |
3918 | spec->use_jack_tbl = 1; | ||
3919 | alc_auto_init_multi_out(codec); | 3916 | alc_auto_init_multi_out(codec); |
3920 | alc_auto_init_extra_out(codec); | 3917 | alc_auto_init_extra_out(codec); |
3921 | alc_auto_init_analog_input(codec); | 3918 | alc_auto_init_analog_input(codec); |