Skip to content

Commit

Permalink
ALSA: hda/realtek - Remove all ALC262-quirk codes
Browse files Browse the repository at this point in the history
Now that model=ultra is supported well by the auto-parser, we can get rid
of the whole alc262_quirks.c and its related codes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Nov 8, 2011
1 parent 24de183 commit 42399f7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 219 deletions.
14 changes: 1 addition & 13 deletions Documentation/sound/alsa/HD-Audio-Models.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,19 +42,7 @@ ALC260

ALC262
======
fujitsu Fujitsu Laptop
benq Benq ED8
benq-t31 Benq T31
hippo Hippo (ATI) with jack detection, Sony UX-90s
hippo_1 Hippo (Benq) with jack detection
toshiba-s06 Toshiba S06
toshiba-rx1 Toshiba RX1
tyan Tyan Thunder n6650W (S2915-E)
ultra Samsung Q1 Ultra Vista model
lenovo-3000 Lenovo 3000 y410
nec NEC Versa S9100
basic fixed pin assignment w/o SPDIF
auto auto-config reading BIOS (default)
N/A

ALC267/268
==========
Expand Down
177 changes: 0 additions & 177 deletions sound/pci/hda/alc262_quirks.c

This file was deleted.

36 changes: 7 additions & 29 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -4493,14 +4493,9 @@ static const struct snd_pci_quirk alc262_fixup_tbl[] = {

/*
*/
#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
#include "alc262_quirks.c"
#endif

static int patch_alc262(struct hda_codec *codec)
{
struct alc_spec *spec;
int board_config;
int err;

spec = kzalloc(sizeof(*spec), GFP_KERNEL);
Expand All @@ -4527,29 +4522,13 @@ static int patch_alc262(struct hda_codec *codec)

alc_fix_pll_init(codec, 0x20, 0x0a, 10);

board_config = alc_board_config(codec, ALC262_MODEL_LAST,
alc262_models, alc262_cfg_tbl);

if (board_config < 0) {
printk(KERN_INFO "hda_codec: %s: BIOS auto-probing.\n",
codec->chip_name);
board_config = ALC_MODEL_AUTO;
}

if (board_config == ALC_MODEL_AUTO) {
alc_pick_fixup(codec, NULL, alc262_fixup_tbl, alc262_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
}

if (board_config == ALC_MODEL_AUTO) {
/* automatic parse from the BIOS config */
err = alc262_parse_auto_config(codec);
if (err < 0)
goto error;
}
alc_pick_fixup(codec, NULL, alc262_fixup_tbl, alc262_fixups);
alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);

if (board_config != ALC_MODEL_AUTO)
setup_preset(codec, &alc262_presets[board_config]);
/* automatic parse from the BIOS config */
err = alc262_parse_auto_config(codec);
if (err < 0)
goto error;

if (!spec->no_analog && !spec->adc_nids) {
alc_auto_fill_adc_caps(codec);
Expand All @@ -4572,8 +4551,7 @@ static int patch_alc262(struct hda_codec *codec)
spec->vmaster_nid = 0x0c;

codec->patch_ops = alc_patch_ops;
if (board_config == ALC_MODEL_AUTO)
spec->init_hook = alc_auto_init_std;
spec->init_hook = alc_auto_init_std;
spec->shutup = alc_eapd_shutup;

alc_init_jacks(codec);
Expand Down

0 comments on commit 42399f7

Please sign in to comment.