diff options
author | Takashi Iwai <tiwai@suse.de> | 2005-11-17 08:57:47 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-03 06:19:06 -0500 |
commit | c8b6bf9b5ef1f595a65a3414a5ca2588e8d993b2 (patch) | |
tree | 9c297d352b2f6056fc336fb4ccb3f1a9f4c9a102 /sound/pci/hda/patch_realtek.c | |
parent | 66f8df6bdd388d209c38197785148c994c8a738d (diff) |
[ALSA] Remove xxx_t typedefs: HD-Audio codec
Modules: HDA Codec driver,HDA generic driver
Remove xxx_t typedefs from the HD-Audio codec support codes.
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 | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 3ff72c49cd26..62e6993056e6 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -63,7 +63,7 @@ enum { | |||
63 | 63 | ||
64 | struct alc_spec { | 64 | struct alc_spec { |
65 | /* codec parameterization */ | 65 | /* codec parameterization */ |
66 | snd_kcontrol_new_t *mixers[3]; /* mixer arrays */ | 66 | struct snd_kcontrol_new *mixers[3]; /* mixer arrays */ |
67 | unsigned int num_mixers; | 67 | unsigned int num_mixers; |
68 | 68 | ||
69 | const struct hda_verb *init_verbs[3]; /* initialization verbs | 69 | const struct hda_verb *init_verbs[3]; /* initialization verbs |
@@ -104,7 +104,7 @@ struct alc_spec { | |||
104 | /* dynamic controls, init_verbs and input_mux */ | 104 | /* dynamic controls, init_verbs and input_mux */ |
105 | struct auto_pin_cfg autocfg; | 105 | struct auto_pin_cfg autocfg; |
106 | unsigned int num_kctl_alloc, num_kctl_used; | 106 | unsigned int num_kctl_alloc, num_kctl_used; |
107 | snd_kcontrol_new_t *kctl_alloc; | 107 | struct snd_kcontrol_new *kctl_alloc; |
108 | struct hda_input_mux private_imux; | 108 | struct hda_input_mux private_imux; |
109 | hda_nid_t private_dac_nids[4]; | 109 | hda_nid_t private_dac_nids[4]; |
110 | }; | 110 | }; |
@@ -113,14 +113,14 @@ struct alc_spec { | |||
113 | /* | 113 | /* |
114 | * input MUX handling | 114 | * input MUX handling |
115 | */ | 115 | */ |
116 | static int alc_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 116 | static int alc_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
117 | { | 117 | { |
118 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 118 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
119 | struct alc_spec *spec = codec->spec; | 119 | struct alc_spec *spec = codec->spec; |
120 | return snd_hda_input_mux_info(spec->input_mux, uinfo); | 120 | return snd_hda_input_mux_info(spec->input_mux, uinfo); |
121 | } | 121 | } |
122 | 122 | ||
123 | static int alc_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 123 | static int alc_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
124 | { | 124 | { |
125 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 125 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
126 | struct alc_spec *spec = codec->spec; | 126 | struct alc_spec *spec = codec->spec; |
@@ -130,7 +130,7 @@ static int alc_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon | |||
130 | return 0; | 130 | return 0; |
131 | } | 131 | } |
132 | 132 | ||
133 | static int alc_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 133 | static int alc_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
134 | { | 134 | { |
135 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 135 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
136 | struct alc_spec *spec = codec->spec; | 136 | struct alc_spec *spec = codec->spec; |
@@ -143,7 +143,7 @@ static int alc_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon | |||
143 | /* | 143 | /* |
144 | * channel mode setting | 144 | * channel mode setting |
145 | */ | 145 | */ |
146 | static int alc880_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 146 | static int alc880_ch_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
147 | { | 147 | { |
148 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 148 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
149 | struct alc_spec *spec = codec->spec; | 149 | struct alc_spec *spec = codec->spec; |
@@ -151,7 +151,7 @@ static int alc880_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *ui | |||
151 | spec->num_channel_mode); | 151 | spec->num_channel_mode); |
152 | } | 152 | } |
153 | 153 | ||
154 | static int alc880_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 154 | static int alc880_ch_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
155 | { | 155 | { |
156 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 156 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
157 | struct alc_spec *spec = codec->spec; | 157 | struct alc_spec *spec = codec->spec; |
@@ -159,7 +159,7 @@ static int alc880_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc | |||
159 | spec->num_channel_mode, spec->multiout.max_channels); | 159 | spec->num_channel_mode, spec->multiout.max_channels); |
160 | } | 160 | } |
161 | 161 | ||
162 | static int alc880_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 162 | static int alc880_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
163 | { | 163 | { |
164 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 164 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
165 | struct alc_spec *spec = codec->spec; | 165 | struct alc_spec *spec = codec->spec; |
@@ -173,7 +173,7 @@ static int alc880_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *uc | |||
173 | * supported, so VrefEn can't be controlled using these functions as they | 173 | * supported, so VrefEn can't be controlled using these functions as they |
174 | * stand. | 174 | * stand. |
175 | */ | 175 | */ |
176 | static int alc_pinctl_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 176 | static int alc_pinctl_switch_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
177 | { | 177 | { |
178 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; | 178 | uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; |
179 | uinfo->count = 1; | 179 | uinfo->count = 1; |
@@ -182,7 +182,7 @@ static int alc_pinctl_switch_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t | |||
182 | return 0; | 182 | return 0; |
183 | } | 183 | } |
184 | 184 | ||
185 | static int alc_pinctl_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 185 | static int alc_pinctl_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
186 | { | 186 | { |
187 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 187 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
188 | hda_nid_t nid = kcontrol->private_value & 0xffff; | 188 | hda_nid_t nid = kcontrol->private_value & 0xffff; |
@@ -195,7 +195,7 @@ static int alc_pinctl_switch_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t | |||
195 | return 0; | 195 | return 0; |
196 | } | 196 | } |
197 | 197 | ||
198 | static int alc_pinctl_switch_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 198 | static int alc_pinctl_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
199 | { | 199 | { |
200 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 200 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
201 | hda_nid_t nid = kcontrol->private_value & 0xffff; | 201 | hda_nid_t nid = kcontrol->private_value & 0xffff; |
@@ -284,7 +284,7 @@ static struct hda_channel_mode alc880_threestack_modes[2] = { | |||
284 | { 6, alc880_threestack_ch6_init }, | 284 | { 6, alc880_threestack_ch6_init }, |
285 | }; | 285 | }; |
286 | 286 | ||
287 | static snd_kcontrol_new_t alc880_three_stack_mixer[] = { | 287 | static struct snd_kcontrol_new alc880_three_stack_mixer[] = { |
288 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 288 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
289 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 289 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
290 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT), | 290 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0f, 0x0, HDA_OUTPUT), |
@@ -315,7 +315,7 @@ static snd_kcontrol_new_t alc880_three_stack_mixer[] = { | |||
315 | }; | 315 | }; |
316 | 316 | ||
317 | /* capture mixer elements */ | 317 | /* capture mixer elements */ |
318 | static snd_kcontrol_new_t alc880_capture_mixer[] = { | 318 | static struct snd_kcontrol_new alc880_capture_mixer[] = { |
319 | HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT), | 319 | HDA_CODEC_VOLUME("Capture Volume", 0x07, 0x0, HDA_INPUT), |
320 | HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT), | 320 | HDA_CODEC_MUTE("Capture Switch", 0x07, 0x0, HDA_INPUT), |
321 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT), | 321 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x08, 0x0, HDA_INPUT), |
@@ -339,7 +339,7 @@ static snd_kcontrol_new_t alc880_capture_mixer[] = { | |||
339 | }; | 339 | }; |
340 | 340 | ||
341 | /* capture mixer elements (in case NID 0x07 not available) */ | 341 | /* capture mixer elements (in case NID 0x07 not available) */ |
342 | static snd_kcontrol_new_t alc880_capture_alt_mixer[] = { | 342 | static struct snd_kcontrol_new alc880_capture_alt_mixer[] = { |
343 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), | 343 | HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), |
344 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), | 344 | HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), |
345 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), | 345 | HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), |
@@ -371,7 +371,7 @@ static snd_kcontrol_new_t alc880_capture_alt_mixer[] = { | |||
371 | */ | 371 | */ |
372 | 372 | ||
373 | /* additional mixers to alc880_three_stack_mixer */ | 373 | /* additional mixers to alc880_three_stack_mixer */ |
374 | static snd_kcontrol_new_t alc880_five_stack_mixer[] = { | 374 | static struct snd_kcontrol_new alc880_five_stack_mixer[] = { |
375 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 375 | HDA_CODEC_VOLUME("Side Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
376 | HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT), | 376 | HDA_BIND_MUTE("Side Playback Switch", 0x0d, 2, HDA_INPUT), |
377 | { } /* end */ | 377 | { } /* end */ |
@@ -428,7 +428,7 @@ static struct hda_channel_mode alc880_sixstack_modes[1] = { | |||
428 | { 8, NULL }, | 428 | { 8, NULL }, |
429 | }; | 429 | }; |
430 | 430 | ||
431 | static snd_kcontrol_new_t alc880_six_stack_mixer[] = { | 431 | static struct snd_kcontrol_new alc880_six_stack_mixer[] = { |
432 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 432 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
433 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 433 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
434 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 434 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
@@ -496,7 +496,7 @@ static struct hda_channel_mode alc880_w810_modes[1] = { | |||
496 | }; | 496 | }; |
497 | 497 | ||
498 | /* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */ | 498 | /* Pin assignment: Front = 0x14, Surr = 0x15, CLFE = 0x16, HP = 0x1b */ |
499 | static snd_kcontrol_new_t alc880_w810_base_mixer[] = { | 499 | static struct snd_kcontrol_new alc880_w810_base_mixer[] = { |
500 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 500 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
501 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 501 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
502 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 502 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
@@ -527,7 +527,7 @@ static struct hda_channel_mode alc880_2_jack_modes[1] = { | |||
527 | { 2, NULL } | 527 | { 2, NULL } |
528 | }; | 528 | }; |
529 | 529 | ||
530 | static snd_kcontrol_new_t alc880_z71v_mixer[] = { | 530 | static struct snd_kcontrol_new alc880_z71v_mixer[] = { |
531 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 531 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
532 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 532 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
533 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 533 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
@@ -553,7 +553,7 @@ static hda_nid_t alc880_f1734_dac_nids[1] = { | |||
553 | }; | 553 | }; |
554 | #define ALC880_F1734_HP_DAC 0x02 | 554 | #define ALC880_F1734_HP_DAC 0x02 |
555 | 555 | ||
556 | static snd_kcontrol_new_t alc880_f1734_mixer[] = { | 556 | static struct snd_kcontrol_new alc880_f1734_mixer[] = { |
557 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 557 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
558 | HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT), | 558 | HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT), |
559 | HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 559 | HDA_CODEC_VOLUME("Internal Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
@@ -578,7 +578,7 @@ static snd_kcontrol_new_t alc880_f1734_mixer[] = { | |||
578 | #define alc880_asus_dac_nids alc880_w810_dac_nids /* identical with w810 */ | 578 | #define alc880_asus_dac_nids alc880_w810_dac_nids /* identical with w810 */ |
579 | #define alc880_asus_modes alc880_threestack_modes /* 2/6 channel mode */ | 579 | #define alc880_asus_modes alc880_threestack_modes /* 2/6 channel mode */ |
580 | 580 | ||
581 | static snd_kcontrol_new_t alc880_asus_mixer[] = { | 581 | static struct snd_kcontrol_new alc880_asus_mixer[] = { |
582 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 582 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
583 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 583 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
584 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 584 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
@@ -613,14 +613,14 @@ static snd_kcontrol_new_t alc880_asus_mixer[] = { | |||
613 | */ | 613 | */ |
614 | 614 | ||
615 | /* additional mixers to alc880_asus_mixer */ | 615 | /* additional mixers to alc880_asus_mixer */ |
616 | static snd_kcontrol_new_t alc880_asus_w1v_mixer[] = { | 616 | static struct snd_kcontrol_new alc880_asus_w1v_mixer[] = { |
617 | HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT), | 617 | HDA_CODEC_VOLUME("Line2 Playback Volume", 0x0b, 0x03, HDA_INPUT), |
618 | HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT), | 618 | HDA_CODEC_MUTE("Line2 Playback Switch", 0x0b, 0x03, HDA_INPUT), |
619 | { } /* end */ | 619 | { } /* end */ |
620 | }; | 620 | }; |
621 | 621 | ||
622 | /* additional mixers to alc880_asus_mixer */ | 622 | /* additional mixers to alc880_asus_mixer */ |
623 | static snd_kcontrol_new_t alc880_pcbeep_mixer[] = { | 623 | static struct snd_kcontrol_new alc880_pcbeep_mixer[] = { |
624 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), | 624 | HDA_CODEC_VOLUME("PC Speaker Playback Volume", 0x0b, 0x05, HDA_INPUT), |
625 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), | 625 | HDA_CODEC_MUTE("PC Speaker Playback Switch", 0x0b, 0x05, HDA_INPUT), |
626 | { } /* end */ | 626 | { } /* end */ |
@@ -974,7 +974,7 @@ static int alc_resume(struct hda_codec *codec) | |||
974 | */ | 974 | */ |
975 | static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo, | 975 | static int alc880_playback_pcm_open(struct hda_pcm_stream *hinfo, |
976 | struct hda_codec *codec, | 976 | struct hda_codec *codec, |
977 | snd_pcm_substream_t *substream) | 977 | struct snd_pcm_substream *substream) |
978 | { | 978 | { |
979 | struct alc_spec *spec = codec->spec; | 979 | struct alc_spec *spec = codec->spec; |
980 | return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream); | 980 | return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream); |
@@ -984,7 +984,7 @@ static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
984 | struct hda_codec *codec, | 984 | struct hda_codec *codec, |
985 | unsigned int stream_tag, | 985 | unsigned int stream_tag, |
986 | unsigned int format, | 986 | unsigned int format, |
987 | snd_pcm_substream_t *substream) | 987 | struct snd_pcm_substream *substream) |
988 | { | 988 | { |
989 | struct alc_spec *spec = codec->spec; | 989 | struct alc_spec *spec = codec->spec; |
990 | return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag, | 990 | return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag, |
@@ -993,7 +993,7 @@ static int alc880_playback_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
993 | 993 | ||
994 | static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, | 994 | static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, |
995 | struct hda_codec *codec, | 995 | struct hda_codec *codec, |
996 | snd_pcm_substream_t *substream) | 996 | struct snd_pcm_substream *substream) |
997 | { | 997 | { |
998 | struct alc_spec *spec = codec->spec; | 998 | struct alc_spec *spec = codec->spec; |
999 | return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout); | 999 | return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout); |
@@ -1004,7 +1004,7 @@ static int alc880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, | |||
1004 | */ | 1004 | */ |
1005 | static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, | 1005 | static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, |
1006 | struct hda_codec *codec, | 1006 | struct hda_codec *codec, |
1007 | snd_pcm_substream_t *substream) | 1007 | struct snd_pcm_substream *substream) |
1008 | { | 1008 | { |
1009 | struct alc_spec *spec = codec->spec; | 1009 | struct alc_spec *spec = codec->spec; |
1010 | return snd_hda_multi_out_dig_open(codec, &spec->multiout); | 1010 | return snd_hda_multi_out_dig_open(codec, &spec->multiout); |
@@ -1012,7 +1012,7 @@ static int alc880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, | |||
1012 | 1012 | ||
1013 | static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, | 1013 | static int alc880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, |
1014 | struct hda_codec *codec, | 1014 | struct hda_codec *codec, |
1015 | snd_pcm_substream_t *substream) | 1015 | struct snd_pcm_substream *substream) |
1016 | { | 1016 | { |
1017 | struct alc_spec *spec = codec->spec; | 1017 | struct alc_spec *spec = codec->spec; |
1018 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); | 1018 | return snd_hda_multi_out_dig_close(codec, &spec->multiout); |
@@ -1025,7 +1025,7 @@ static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
1025 | struct hda_codec *codec, | 1025 | struct hda_codec *codec, |
1026 | unsigned int stream_tag, | 1026 | unsigned int stream_tag, |
1027 | unsigned int format, | 1027 | unsigned int format, |
1028 | snd_pcm_substream_t *substream) | 1028 | struct snd_pcm_substream *substream) |
1029 | { | 1029 | { |
1030 | struct alc_spec *spec = codec->spec; | 1030 | struct alc_spec *spec = codec->spec; |
1031 | 1031 | ||
@@ -1036,7 +1036,7 @@ static int alc880_capture_pcm_prepare(struct hda_pcm_stream *hinfo, | |||
1036 | 1036 | ||
1037 | static int alc880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, | 1037 | static int alc880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, |
1038 | struct hda_codec *codec, | 1038 | struct hda_codec *codec, |
1039 | snd_pcm_substream_t *substream) | 1039 | struct snd_pcm_substream *substream) |
1040 | { | 1040 | { |
1041 | struct alc_spec *spec = codec->spec; | 1041 | struct alc_spec *spec = codec->spec; |
1042 | 1042 | ||
@@ -1185,7 +1185,7 @@ static struct hda_channel_mode alc880_test_modes[4] = { | |||
1185 | { 8, NULL }, | 1185 | { 8, NULL }, |
1186 | }; | 1186 | }; |
1187 | 1187 | ||
1188 | static int alc_test_pin_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 1188 | static int alc_test_pin_ctl_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
1189 | { | 1189 | { |
1190 | static char *texts[] = { | 1190 | static char *texts[] = { |
1191 | "N/A", "Line Out", "HP Out", | 1191 | "N/A", "Line Out", "HP Out", |
@@ -1200,7 +1200,7 @@ static int alc_test_pin_ctl_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * | |||
1200 | return 0; | 1200 | return 0; |
1201 | } | 1201 | } |
1202 | 1202 | ||
1203 | static int alc_test_pin_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 1203 | static int alc_test_pin_ctl_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
1204 | { | 1204 | { |
1205 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 1205 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
1206 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; | 1206 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; |
@@ -1226,7 +1226,7 @@ static int alc_test_pin_ctl_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * | |||
1226 | return 0; | 1226 | return 0; |
1227 | } | 1227 | } |
1228 | 1228 | ||
1229 | static int alc_test_pin_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 1229 | static int alc_test_pin_ctl_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
1230 | { | 1230 | { |
1231 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 1231 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
1232 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; | 1232 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; |
@@ -1252,7 +1252,7 @@ static int alc_test_pin_ctl_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * | |||
1252 | return 0; | 1252 | return 0; |
1253 | } | 1253 | } |
1254 | 1254 | ||
1255 | static int alc_test_pin_src_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) | 1255 | static int alc_test_pin_src_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) |
1256 | { | 1256 | { |
1257 | static char *texts[] = { | 1257 | static char *texts[] = { |
1258 | "Front", "Surround", "CLFE", "Side" | 1258 | "Front", "Surround", "CLFE", "Side" |
@@ -1266,7 +1266,7 @@ static int alc_test_pin_src_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t * | |||
1266 | return 0; | 1266 | return 0; |
1267 | } | 1267 | } |
1268 | 1268 | ||
1269 | static int alc_test_pin_src_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 1269 | static int alc_test_pin_src_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
1270 | { | 1270 | { |
1271 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 1271 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
1272 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; | 1272 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; |
@@ -1277,7 +1277,7 @@ static int alc_test_pin_src_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * | |||
1277 | return 0; | 1277 | return 0; |
1278 | } | 1278 | } |
1279 | 1279 | ||
1280 | static int alc_test_pin_src_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 1280 | static int alc_test_pin_src_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
1281 | { | 1281 | { |
1282 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 1282 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
1283 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; | 1283 | hda_nid_t nid = (hda_nid_t)kcontrol->private_value; |
@@ -1310,7 +1310,7 @@ static int alc_test_pin_src_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t * | |||
1310 | .private_value = nid \ | 1310 | .private_value = nid \ |
1311 | } | 1311 | } |
1312 | 1312 | ||
1313 | static snd_kcontrol_new_t alc880_test_mixer[] = { | 1313 | static struct snd_kcontrol_new alc880_test_mixer[] = { |
1314 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 1314 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
1315 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 1315 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |
1316 | HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT), | 1316 | HDA_CODEC_VOLUME("CLFE Playback Volume", 0x0e, 0x0, HDA_OUTPUT), |
@@ -1527,7 +1527,7 @@ static struct hda_board_config alc880_cfg_tbl[] = { | |||
1527 | * configuration template - to be copied to the spec instance | 1527 | * configuration template - to be copied to the spec instance |
1528 | */ | 1528 | */ |
1529 | struct alc_config_preset { | 1529 | struct alc_config_preset { |
1530 | snd_kcontrol_new_t *mixers[4]; | 1530 | struct snd_kcontrol_new *mixers[4]; |
1531 | const struct hda_verb *init_verbs[4]; | 1531 | const struct hda_verb *init_verbs[4]; |
1532 | unsigned int num_dacs; | 1532 | unsigned int num_dacs; |
1533 | hda_nid_t *dac_nids; | 1533 | hda_nid_t *dac_nids; |
@@ -1698,7 +1698,7 @@ enum { | |||
1698 | ALC_CTL_WIDGET_MUTE, | 1698 | ALC_CTL_WIDGET_MUTE, |
1699 | ALC_CTL_BIND_MUTE, | 1699 | ALC_CTL_BIND_MUTE, |
1700 | }; | 1700 | }; |
1701 | static snd_kcontrol_new_t alc880_control_templates[] = { | 1701 | static struct snd_kcontrol_new alc880_control_templates[] = { |
1702 | HDA_CODEC_VOLUME(NULL, 0, 0, 0), | 1702 | HDA_CODEC_VOLUME(NULL, 0, 0, 0), |
1703 | HDA_CODEC_MUTE(NULL, 0, 0, 0), | 1703 | HDA_CODEC_MUTE(NULL, 0, 0, 0), |
1704 | HDA_BIND_MUTE(NULL, 0, 0, 0), | 1704 | HDA_BIND_MUTE(NULL, 0, 0, 0), |
@@ -1707,7 +1707,7 @@ static snd_kcontrol_new_t alc880_control_templates[] = { | |||
1707 | /* add dynamic controls */ | 1707 | /* add dynamic controls */ |
1708 | static int add_control(struct alc_spec *spec, int type, const char *name, unsigned long val) | 1708 | static int add_control(struct alc_spec *spec, int type, const char *name, unsigned long val) |
1709 | { | 1709 | { |
1710 | snd_kcontrol_new_t *knew; | 1710 | struct snd_kcontrol_new *knew; |
1711 | 1711 | ||
1712 | if (spec->num_kctl_used >= spec->num_kctl_alloc) { | 1712 | if (spec->num_kctl_used >= spec->num_kctl_alloc) { |
1713 | int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; | 1713 | int num = spec->num_kctl_alloc + NUM_CONTROL_ALLOC; |
@@ -2168,7 +2168,7 @@ static struct hda_channel_mode alc260_modes[1] = { | |||
2168 | { 2, NULL }, | 2168 | { 2, NULL }, |
2169 | }; | 2169 | }; |
2170 | 2170 | ||
2171 | static snd_kcontrol_new_t alc260_base_mixer[] = { | 2171 | static struct snd_kcontrol_new alc260_base_mixer[] = { |
2172 | HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT), | 2172 | HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT), |
2173 | HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT), | 2173 | HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT), |
2174 | HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT), | 2174 | HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT), |
@@ -2197,7 +2197,7 @@ static snd_kcontrol_new_t alc260_base_mixer[] = { | |||
2197 | { } /* end */ | 2197 | { } /* end */ |
2198 | }; | 2198 | }; |
2199 | 2199 | ||
2200 | static snd_kcontrol_new_t alc260_hp_mixer[] = { | 2200 | static struct snd_kcontrol_new alc260_hp_mixer[] = { |
2201 | HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT), | 2201 | HDA_CODEC_VOLUME("Front Playback Volume", 0x08, 0x0, HDA_OUTPUT), |
2202 | HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT), | 2202 | HDA_BIND_MUTE("Front Playback Switch", 0x08, 2, HDA_INPUT), |
2203 | HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT), | 2203 | HDA_CODEC_VOLUME("CD Playback Volume", 0x07, 0x04, HDA_INPUT), |
@@ -2224,7 +2224,7 @@ static snd_kcontrol_new_t alc260_hp_mixer[] = { | |||
2224 | { } /* end */ | 2224 | { } /* end */ |
2225 | }; | 2225 | }; |
2226 | 2226 | ||
2227 | static snd_kcontrol_new_t alc260_fujitsu_mixer[] = { | 2227 | static struct snd_kcontrol_new alc260_fujitsu_mixer[] = { |
2228 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT), | 2228 | HDA_CODEC_VOLUME("Headphone Playback Volume", 0x08, 0x0, HDA_OUTPUT), |
2229 | HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT), | 2229 | HDA_BIND_MUTE("Headphone Playback Switch", 0x08, 2, HDA_INPUT), |
2230 | ALC_PINCTL_SWITCH("Headphone Amp Switch", 0x14, PIN_HP_AMP), | 2230 | ALC_PINCTL_SWITCH("Headphone Amp Switch", 0x14, PIN_HP_AMP), |
@@ -2498,7 +2498,7 @@ static struct hda_input_mux alc882_capture_source = { | |||
2498 | #define alc882_mux_enum_info alc_mux_enum_info | 2498 | #define alc882_mux_enum_info alc_mux_enum_info |
2499 | #define alc882_mux_enum_get alc_mux_enum_get | 2499 | #define alc882_mux_enum_get alc_mux_enum_get |
2500 | 2500 | ||
2501 | static int alc882_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) | 2501 | static int alc882_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) |
2502 | { | 2502 | { |
2503 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); | 2503 | struct hda_codec *codec = snd_kcontrol_chip(kcontrol); |
2504 | struct alc_spec *spec = codec->spec; | 2504 | struct alc_spec *spec = codec->spec; |
@@ -2526,7 +2526,7 @@ static int alc882_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *u | |||
2526 | /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17 | 2526 | /* Pin assignment: Front=0x14, Rear=0x15, CLFE=0x16, Side=0x17 |
2527 | * Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b | 2527 | * Mic=0x18, Front Mic=0x19, Line-In=0x1a, HP=0x1b |
2528 | */ | 2528 | */ |
2529 | static snd_kcontrol_new_t alc882_base_mixer[] = { | 2529 | static struct snd_kcontrol_new alc882_base_mixer[] = { |
2530 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), | 2530 | HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), |
2531 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), | 2531 | HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), |
2532 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), | 2532 | HDA_CODEC_VOLUME("Surround Playback Volume", 0x0d, 0x0, HDA_OUTPUT), |