diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-11-14 11:20:49 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-11-14 11:20:49 -0500 |
commit | 3ccbf1c3763510d5c443133f9aa40d8bf4ae8db9 (patch) | |
tree | 1fdaf542c11688693d0e4645816d5eedf70c5529 /sound/pci | |
parent | e29d377814b83af816fb8c1857605b9c4196477b (diff) |
ALSA: hda/realtek - Remove left-over chunks in alc882_quirks.c
Remove unused variables.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/alc882_quirks.c | 102 |
1 files changed, 0 insertions, 102 deletions
diff --git a/sound/pci/hda/alc882_quirks.c b/sound/pci/hda/alc882_quirks.c index c1f6ac660fea..403e30a36599 100644 --- a/sound/pci/hda/alc882_quirks.c +++ b/sound/pci/hda/alc882_quirks.c | |||
@@ -13,10 +13,6 @@ enum { | |||
13 | ALC885_MACMINI3, | 13 | ALC885_MACMINI3, |
14 | ALC885_IMAC24, | 14 | ALC885_IMAC24, |
15 | ALC885_IMAC91, | 15 | ALC885_IMAC91, |
16 | ALC888_ACER_ASPIRE_4930G, | ||
17 | ALC888_ACER_ASPIRE_6530G, | ||
18 | ALC888_ACER_ASPIRE_8930G, | ||
19 | ALC888_ACER_ASPIRE_7730G, | ||
20 | ALC889A_MB31, | 16 | ALC889A_MB31, |
21 | ALC882_MODEL_LAST, | 17 | ALC882_MODEL_LAST, |
22 | }; | 18 | }; |
@@ -43,15 +39,9 @@ static const hda_nid_t alc882_dac_nids[4] = { | |||
43 | #define alc882_adc_nids alc880_adc_nids | 39 | #define alc882_adc_nids alc880_adc_nids |
44 | #define alc882_adc_nids_alt alc880_adc_nids_alt | 40 | #define alc882_adc_nids_alt alc880_adc_nids_alt |
45 | #define alc883_adc_nids alc882_adc_nids_alt | 41 | #define alc883_adc_nids alc882_adc_nids_alt |
46 | static const hda_nid_t alc883_adc_nids_alt[1] = { 0x08 }; | ||
47 | static const hda_nid_t alc883_adc_nids_rev[2] = { 0x09, 0x08 }; | ||
48 | #define alc889_adc_nids alc880_adc_nids | ||
49 | 42 | ||
50 | static const hda_nid_t alc882_capsrc_nids[3] = { 0x24, 0x23, 0x22 }; | ||
51 | static const hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 }; | 43 | static const hda_nid_t alc882_capsrc_nids_alt[2] = { 0x23, 0x22 }; |
52 | #define alc883_capsrc_nids alc882_capsrc_nids_alt | 44 | #define alc883_capsrc_nids alc882_capsrc_nids_alt |
53 | static const hda_nid_t alc883_capsrc_nids_rev[2] = { 0x22, 0x23 }; | ||
54 | #define alc889_capsrc_nids alc882_capsrc_nids | ||
55 | 45 | ||
56 | /* input MUX */ | 46 | /* input MUX */ |
57 | /* FIXME: should be a matrix-type input source selection */ | 47 | /* FIXME: should be a matrix-type input source selection */ |
@@ -68,15 +58,6 @@ static const struct hda_input_mux alc882_capture_source = { | |||
68 | 58 | ||
69 | #define alc883_capture_source alc882_capture_source | 59 | #define alc883_capture_source alc882_capture_source |
70 | 60 | ||
71 | static const struct hda_input_mux alc889_capture_source = { | ||
72 | .num_items = 3, | ||
73 | .items = { | ||
74 | { "Front Mic", 0x0 }, | ||
75 | { "Mic", 0x3 }, | ||
76 | { "Line", 0x2 }, | ||
77 | }, | ||
78 | }; | ||
79 | |||
80 | static const struct hda_input_mux mb5_capture_source = { | 61 | static const struct hda_input_mux mb5_capture_source = { |
81 | .num_items = 3, | 62 | .num_items = 3, |
82 | .items = { | 63 | .items = { |
@@ -123,58 +104,6 @@ static const struct hda_input_mux alc889A_imac91_capture_source = { | |||
123 | }, | 104 | }, |
124 | }; | 105 | }; |
125 | 106 | ||
126 | /* | ||
127 | * 2ch mode | ||
128 | */ | ||
129 | static const struct hda_channel_mode alc883_3ST_2ch_modes[1] = { | ||
130 | { 2, NULL } | ||
131 | }; | ||
132 | |||
133 | /* | ||
134 | * 2ch mode | ||
135 | */ | ||
136 | static const struct hda_verb alc882_3ST_ch2_init[] = { | ||
137 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, | ||
138 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
139 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, | ||
140 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
141 | { } /* end */ | ||
142 | }; | ||
143 | |||
144 | /* | ||
145 | * 4ch mode | ||
146 | */ | ||
147 | static const struct hda_verb alc882_3ST_ch4_init[] = { | ||
148 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF80 }, | ||
149 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE }, | ||
150 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
151 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
152 | { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 }, | ||
153 | { } /* end */ | ||
154 | }; | ||
155 | |||
156 | /* | ||
157 | * 6ch mode | ||
158 | */ | ||
159 | static const struct hda_verb alc882_3ST_ch6_init[] = { | ||
160 | { 0x18, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
161 | { 0x18, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
162 | { 0x18, AC_VERB_SET_CONNECT_SEL, 0x02 }, | ||
163 | { 0x1a, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT }, | ||
164 | { 0x1a, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE }, | ||
165 | { 0x1a, AC_VERB_SET_CONNECT_SEL, 0x01 }, | ||
166 | { } /* end */ | ||
167 | }; | ||
168 | |||
169 | static const struct hda_channel_mode alc882_3ST_6ch_modes[3] = { | ||
170 | { 2, alc882_3ST_ch2_init }, | ||
171 | { 4, alc882_3ST_ch4_init }, | ||
172 | { 6, alc882_3ST_ch6_init }, | ||
173 | }; | ||
174 | |||
175 | #define alc883_3ST_6ch_modes alc882_3ST_6ch_modes | ||
176 | |||
177 | |||
178 | /* Macbook Air 2,1 */ | 107 | /* Macbook Air 2,1 */ |
179 | 108 | ||
180 | static const struct hda_channel_mode alc885_mba21_ch_modes[1] = { | 109 | static const struct hda_channel_mode alc885_mba21_ch_modes[1] = { |
@@ -380,24 +309,6 @@ static const struct hda_verb alc882_base_init_verbs[] = { | |||
380 | { } | 309 | { } |
381 | }; | 310 | }; |
382 | 311 | ||
383 | static const struct hda_verb alc882_adc1_init_verbs[] = { | ||
384 | /* Input mixer1: unmute Mic, F-Mic, Line, CD inputs */ | ||
385 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, | ||
386 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(3)}, | ||
387 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(2)}, | ||
388 | {0x24, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(4)}, | ||
389 | /* ADC1: mute amp left and right */ | ||
390 | {0x07, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_MUTE(0)}, | ||
391 | {0x07, AC_VERB_SET_CONNECT_SEL, 0x00}, | ||
392 | { } | ||
393 | }; | ||
394 | |||
395 | static const struct hda_verb alc889_eapd_verbs[] = { | ||
396 | {0x14, AC_VERB_SET_EAPD_BTLENABLE, 2}, | ||
397 | {0x15, AC_VERB_SET_EAPD_BTLENABLE, 2}, | ||
398 | { } | ||
399 | }; | ||
400 | |||
401 | #define alc883_init_verbs alc882_base_init_verbs | 312 | #define alc883_init_verbs alc882_base_init_verbs |
402 | 313 | ||
403 | /* Mac Pro test */ | 314 | /* Mac Pro test */ |
@@ -889,19 +800,6 @@ static const struct snd_kcontrol_new alc883_3ST_6ch_mixer[] = { | |||
889 | { } /* end */ | 800 | { } /* end */ |
890 | }; | 801 | }; |
891 | 802 | ||
892 | static const struct snd_kcontrol_new alc888_acer_aspire_6530_mixer[] = { | ||
893 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | ||
894 | HDA_CODEC_VOLUME("LFE Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | ||
895 | HDA_CODEC_VOLUME("Line Playback Volume", 0x0b, 0x02, HDA_INPUT), | ||
896 | HDA_CODEC_MUTE("Line Playback Switch", 0x0b, 0x02, HDA_INPUT), | ||
897 | HDA_CODEC_VOLUME("CD Playback Volume", 0x0b, 0x04, HDA_INPUT), | ||
898 | HDA_CODEC_MUTE("CD Playback Switch", 0x0b, 0x04, HDA_INPUT), | ||
899 | HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), | ||
900 | HDA_CODEC_VOLUME("Mic Boost Volume", 0x18, 0, HDA_INPUT), | ||
901 | HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), | ||
902 | { } /* end */ | ||
903 | }; | ||
904 | |||
905 | static const struct snd_kcontrol_new alc889A_mb31_mixer[] = { | 803 | static const struct snd_kcontrol_new alc889A_mb31_mixer[] = { |
906 | /* Output mixers */ | 804 | /* Output mixers */ |
907 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT), | 805 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x00, HDA_OUTPUT), |