ALSA: hda/realtek - Remove leftover static quirks for ALC260

Now we can clean up all static quirks for ALC260.
Also many codes in alc_quirks.c can be ripped off since they have been
used only by ALC260 static quirks.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 8 insertions, 40 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0d81eeb563c7..3ea42069b8ee 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -4308,14 +4308,10 @@ static const struct snd_pci_quirk alc260_fixup_tbl[] = {
 
 /*
  */
-#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
-#include "alc260_quirks.c"
-#endif
-
 static int patch_alc260(struct hda_codec *codec)
 {
         struct alc_spec *spec;
-        int err, board_config;
+        int err;
 
         spec = kzalloc(sizeof(*spec), GFP_KERNEL);
         if (spec == NULL)
@@ -4325,38 +4321,13 @@ static int patch_alc260(struct hda_codec *codec)
 
         spec->mixer_nid = 0x07;
 
-        board_config = alc_board_config(codec, ALC260_MODEL_LAST,
-                                        alc260_models, alc260_cfg_tbl);
-        if (board_config < 0) {
-                snd_printd(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, alc260_fixup_tbl, alc260_fixups);
-                alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
-        }
-
-        if (board_config == ALC_MODEL_AUTO) {
-                /* automatic parse from the BIOS config */
-                err = alc260_parse_auto_config(codec);
-                if (err < 0)
-                        goto error;
-#ifdef CONFIG_SND_HDA_ENABLE_REALTEK_QUIRKS
-                else if (!err) {
-                        printk(KERN_INFO
-                               "hda_codec: Cannot set up configuration "
-                               "from BIOS.  Using base mode...\n");
-                        board_config = ALC260_BASIC;
-                }
-#endif
-        }
+        alc_pick_fixup(codec, NULL, alc260_fixup_tbl, alc260_fixups);
+        alc_apply_fixup(codec, ALC_FIXUP_ACT_PRE_PROBE);
 
-        if (board_config != ALC_MODEL_AUTO) {
-                setup_preset(codec, &alc260_presets[board_config]);
-                spec->vmaster_nid = 0x08;
-        }
+        /* automatic parse from the BIOS config */
+        err = alc260_parse_auto_config(codec);
+        if (err < 0)
+                goto error;
 
         if (!spec->no_analog && !spec->adc_nids) {
                 alc_auto_fill_adc_caps(codec);
@@ -4377,10 +4348,7 @@ static int patch_alc260(struct hda_codec *codec)
         alc_apply_fixup(codec, ALC_FIXUP_ACT_PROBE);
 
         codec->patch_ops = alc_patch_ops;
-        if (board_config == ALC_MODEL_AUTO)
-                spec->init_hook = alc_auto_init_std;
-        else
-                codec->patch_ops.build_controls = __alc_build_controls;
+        spec->init_hook = alc_auto_init_std;
         spec->shutup = alc_eapd_shutup;
 #ifdef CONFIG_SND_HDA_POWER_SAVE
         if (!spec->loopback.amplist)