aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_cmedia.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:57:47 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:19:06 -0500
commitc8b6bf9b5ef1f595a65a3414a5ca2588e8d993b2 (patch)
tree9c297d352b2f6056fc336fb4ccb3f1a9f4c9a102 /sound/pci/hda/patch_cmedia.c
parent66f8df6bdd388d209c38197785148c994c8a738d (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_cmedia.c')
-rw-r--r--sound/pci/hda/patch_cmedia.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/sound/pci/hda/patch_cmedia.c b/sound/pci/hda/patch_cmedia.c
index 37ee1246b2dd..9a6981162982 100644
--- a/sound/pci/hda/patch_cmedia.c
+++ b/sound/pci/hda/patch_cmedia.c
@@ -79,14 +79,14 @@ struct cmi_spec {
79/* 79/*
80 * input MUX 80 * input MUX
81 */ 81 */
82static int cmi_mux_enum_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) 82static int cmi_mux_enum_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
83{ 83{
84 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 84 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
85 struct cmi_spec *spec = codec->spec; 85 struct cmi_spec *spec = codec->spec;
86 return snd_hda_input_mux_info(spec->input_mux, uinfo); 86 return snd_hda_input_mux_info(spec->input_mux, uinfo);
87} 87}
88 88
89static int cmi_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) 89static int cmi_mux_enum_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
90{ 90{
91 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 91 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
92 struct cmi_spec *spec = codec->spec; 92 struct cmi_spec *spec = codec->spec;
@@ -96,7 +96,7 @@ static int cmi_mux_enum_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucon
96 return 0; 96 return 0;
97} 97}
98 98
99static int cmi_mux_enum_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) 99static int cmi_mux_enum_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
100{ 100{
101 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 101 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
102 struct cmi_spec *spec = codec->spec; 102 struct cmi_spec *spec = codec->spec;
@@ -149,7 +149,7 @@ static struct hda_channel_mode cmi9880_channel_modes[3] = {
149 { 8, cmi9880_ch8_init }, 149 { 8, cmi9880_ch8_init },
150}; 150};
151 151
152static int cmi_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo) 152static int cmi_ch_mode_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
153{ 153{
154 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 154 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
155 struct cmi_spec *spec = codec->spec; 155 struct cmi_spec *spec = codec->spec;
@@ -157,7 +157,7 @@ static int cmi_ch_mode_info(snd_kcontrol_t *kcontrol, snd_ctl_elem_info_t *uinfo
157 spec->num_channel_modes); 157 spec->num_channel_modes);
158} 158}
159 159
160static int cmi_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) 160static int cmi_ch_mode_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
161{ 161{
162 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 162 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
163 struct cmi_spec *spec = codec->spec; 163 struct cmi_spec *spec = codec->spec;
@@ -165,7 +165,7 @@ static int cmi_ch_mode_get(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucont
165 spec->num_channel_modes, spec->multiout.max_channels); 165 spec->num_channel_modes, spec->multiout.max_channels);
166} 166}
167 167
168static int cmi_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucontrol) 168static int cmi_ch_mode_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
169{ 169{
170 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 170 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
171 struct cmi_spec *spec = codec->spec; 171 struct cmi_spec *spec = codec->spec;
@@ -175,7 +175,7 @@ static int cmi_ch_mode_put(snd_kcontrol_t *kcontrol, snd_ctl_elem_value_t *ucont
175 175
176/* 176/*
177 */ 177 */
178static snd_kcontrol_new_t cmi9880_basic_mixer[] = { 178static struct snd_kcontrol_new cmi9880_basic_mixer[] = {
179 /* CMI9880 has no playback volumes! */ 179 /* CMI9880 has no playback volumes! */
180 HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), /* front */ 180 HDA_CODEC_MUTE("PCM Playback Switch", 0x03, 0x0, HDA_OUTPUT), /* front */
181 HDA_CODEC_MUTE("Surround Playback Switch", 0x04, 0x0, HDA_OUTPUT), 181 HDA_CODEC_MUTE("Surround Playback Switch", 0x04, 0x0, HDA_OUTPUT),
@@ -207,7 +207,7 @@ static snd_kcontrol_new_t cmi9880_basic_mixer[] = {
207/* 207/*
208 * shared I/O pins 208 * shared I/O pins
209 */ 209 */
210static snd_kcontrol_new_t cmi9880_ch_mode_mixer[] = { 210static struct snd_kcontrol_new cmi9880_ch_mode_mixer[] = {
211 { 211 {
212 .iface = SNDRV_CTL_ELEM_IFACE_MIXER, 212 .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
213 .name = "Channel Mode", 213 .name = "Channel Mode",
@@ -452,7 +452,7 @@ static int cmi9880_resume(struct hda_codec *codec)
452 */ 452 */
453static int cmi9880_playback_pcm_open(struct hda_pcm_stream *hinfo, 453static int cmi9880_playback_pcm_open(struct hda_pcm_stream *hinfo,
454 struct hda_codec *codec, 454 struct hda_codec *codec,
455 snd_pcm_substream_t *substream) 455 struct snd_pcm_substream *substream)
456{ 456{
457 struct cmi_spec *spec = codec->spec; 457 struct cmi_spec *spec = codec->spec;
458 return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream); 458 return snd_hda_multi_out_analog_open(codec, &spec->multiout, substream);
@@ -462,7 +462,7 @@ static int cmi9880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
462 struct hda_codec *codec, 462 struct hda_codec *codec,
463 unsigned int stream_tag, 463 unsigned int stream_tag,
464 unsigned int format, 464 unsigned int format,
465 snd_pcm_substream_t *substream) 465 struct snd_pcm_substream *substream)
466{ 466{
467 struct cmi_spec *spec = codec->spec; 467 struct cmi_spec *spec = codec->spec;
468 return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag, 468 return snd_hda_multi_out_analog_prepare(codec, &spec->multiout, stream_tag,
@@ -471,7 +471,7 @@ static int cmi9880_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
471 471
472static int cmi9880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo, 472static int cmi9880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
473 struct hda_codec *codec, 473 struct hda_codec *codec,
474 snd_pcm_substream_t *substream) 474 struct snd_pcm_substream *substream)
475{ 475{
476 struct cmi_spec *spec = codec->spec; 476 struct cmi_spec *spec = codec->spec;
477 return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout); 477 return snd_hda_multi_out_analog_cleanup(codec, &spec->multiout);
@@ -482,7 +482,7 @@ static int cmi9880_playback_pcm_cleanup(struct hda_pcm_stream *hinfo,
482 */ 482 */
483static int cmi9880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo, 483static int cmi9880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
484 struct hda_codec *codec, 484 struct hda_codec *codec,
485 snd_pcm_substream_t *substream) 485 struct snd_pcm_substream *substream)
486{ 486{
487 struct cmi_spec *spec = codec->spec; 487 struct cmi_spec *spec = codec->spec;
488 return snd_hda_multi_out_dig_open(codec, &spec->multiout); 488 return snd_hda_multi_out_dig_open(codec, &spec->multiout);
@@ -490,7 +490,7 @@ static int cmi9880_dig_playback_pcm_open(struct hda_pcm_stream *hinfo,
490 490
491static int cmi9880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo, 491static int cmi9880_dig_playback_pcm_close(struct hda_pcm_stream *hinfo,
492 struct hda_codec *codec, 492 struct hda_codec *codec,
493 snd_pcm_substream_t *substream) 493 struct snd_pcm_substream *substream)
494{ 494{
495 struct cmi_spec *spec = codec->spec; 495 struct cmi_spec *spec = codec->spec;
496 return snd_hda_multi_out_dig_close(codec, &spec->multiout); 496 return snd_hda_multi_out_dig_close(codec, &spec->multiout);
@@ -503,7 +503,7 @@ static int cmi9880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
503 struct hda_codec *codec, 503 struct hda_codec *codec,
504 unsigned int stream_tag, 504 unsigned int stream_tag,
505 unsigned int format, 505 unsigned int format,
506 snd_pcm_substream_t *substream) 506 struct snd_pcm_substream *substream)
507{ 507{
508 struct cmi_spec *spec = codec->spec; 508 struct cmi_spec *spec = codec->spec;
509 509
@@ -514,7 +514,7 @@ static int cmi9880_capture_pcm_prepare(struct hda_pcm_stream *hinfo,
514 514
515static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo, 515static int cmi9880_capture_pcm_cleanup(struct hda_pcm_stream *hinfo,
516 struct hda_codec *codec, 516 struct hda_codec *codec,
517 snd_pcm_substream_t *substream) 517 struct snd_pcm_substream *substream)
518{ 518{
519 struct cmi_spec *spec = codec->spec; 519 struct cmi_spec *spec = codec->spec;
520 520