ALSA: hda - Get rid of left-over chunks by previous cleanups

Also update the model description, too.

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

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 12c7ea02e5d33c423146fdb33ee16902d24bf987..bb7288858820fcc79e69ded6f55b4f3c89cb924e 100644 (file)
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -93,8 +93,7 @@ ALC662/663/272
 
 ALC680
 ======
-  base         Base model (ASUS NX90)
-  auto         auto-config reading BIOS (default)
+  N/A
 
 ALC882/883/885/888/889
 ======================
@@ -163,10 +162,6 @@ ALC861VD/660VD
   6stack-dig   6-jack with SPDIF OUT
   3stack-660   3-jack (for ALC660VD)
   3stack-660-digout 3-jack with SPDIF OUT (for ALC660VD)
-  lenovo       Lenovo 3000 C200
-  dallas       Dallas laptops
-  hp           HP TX1000
-  asus-v1s     ASUS V1Sn
   auto         auto-config reading BIOS (default)
 
 CMI9880

diff --git a/sound/pci/hda/alc861vd_quirks.c b/sound/pci/hda/alc861vd_quirks.c
index 62b22c90ab778d4dcbdfdd855fc122304817ffdb..9f652254860af664c4f68c721ef1a1776f14ca75 100644 (file)
--- a/sound/pci/hda/alc861vd_quirks.c
+++ b/sound/pci/hda/alc861vd_quirks.c
@@ -159,27 +159,6 @@ static const struct snd_kcontrol_new alc861vd_3st_mixer[] = {
        { } /* end */
 };
 
-static const struct snd_kcontrol_new alc861vd_lenovo_mixer[] = {
-       HDA_CODEC_VOLUME("Front Playback Volume", 0x02, 0x0, HDA_OUTPUT),
-       /*HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT),*/
-       HDA_CODEC_MUTE("Front Playback Switch", 0x14, 0x0, HDA_OUTPUT),
-
-       HDA_CODEC_MUTE("Headphone Playback Switch", 0x1b, 0x0, HDA_OUTPUT),
-
-       HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT),
-       HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT),
-       HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT),
-
-       HDA_CODEC_VOLUME("Front Mic Boost Volume", 0x19, 0, HDA_INPUT),
-       HDA_CODEC_VOLUME("Front Mic Playback Volume", 0x0b, 0x1, HDA_INPUT),
-       HDA_CODEC_MUTE("Front Mic Playback Switch", 0x0b, 0x1, HDA_INPUT),
-
-       HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT),
-       HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT),
-
-       { } /* end */
-};
-
 /*
  * generic initialization of ADC, input mixers and output mixers
  */
@@ -305,11 +284,6 @@ static const struct hda_verb alc861vd_6stack_init_verbs[] = {
        { }
 };
 
-static const struct hda_verb alc861vd_eapd_verbs[] = {
-       {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2},
-       { }
-};
-
 /*
  * configuration and preset
  */