aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda/patch_si3054.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_si3054.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_si3054.c')
-rw-r--r--sound/pci/hda/patch_si3054.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/sound/pci/hda/patch_si3054.c b/sound/pci/hda/patch_si3054.c
index 12b5de29f42f..8f8840e6002b 100644
--- a/sound/pci/hda/patch_si3054.c
+++ b/sound/pci/hda/patch_si3054.c
@@ -95,8 +95,8 @@ struct si3054_spec {
95#define PRIVATE_REG(val) ((val>>16)&0xffff) 95#define PRIVATE_REG(val) ((val>>16)&0xffff)
96#define PRIVATE_MASK(val) (val&0xffff) 96#define PRIVATE_MASK(val) (val&0xffff)
97 97
98static int si3054_switch_info(snd_kcontrol_t *kcontrol, 98static int si3054_switch_info(struct snd_kcontrol *kcontrol,
99 snd_ctl_elem_info_t *uinfo) 99 struct snd_ctl_elem_info *uinfo)
100{ 100{
101 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; 101 uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN;
102 uinfo->count = 1; 102 uinfo->count = 1;
@@ -105,8 +105,8 @@ static int si3054_switch_info(snd_kcontrol_t *kcontrol,
105 return 0; 105 return 0;
106} 106}
107 107
108static int si3054_switch_get(snd_kcontrol_t *kcontrol, 108static int si3054_switch_get(struct snd_kcontrol *kcontrol,
109 snd_ctl_elem_value_t *uvalue) 109 struct snd_ctl_elem_value *uvalue)
110{ 110{
111 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 111 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
112 u16 reg = PRIVATE_REG(kcontrol->private_value); 112 u16 reg = PRIVATE_REG(kcontrol->private_value);
@@ -115,8 +115,8 @@ static int si3054_switch_get(snd_kcontrol_t *kcontrol,
115 return 0; 115 return 0;
116} 116}
117 117
118static int si3054_switch_put(snd_kcontrol_t *kcontrol, 118static int si3054_switch_put(struct snd_kcontrol *kcontrol,
119 snd_ctl_elem_value_t *uvalue) 119 struct snd_ctl_elem_value *uvalue)
120{ 120{
121 struct hda_codec *codec = snd_kcontrol_chip(kcontrol); 121 struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
122 u16 reg = PRIVATE_REG(kcontrol->private_value); 122 u16 reg = PRIVATE_REG(kcontrol->private_value);
@@ -138,7 +138,7 @@ static int si3054_switch_put(snd_kcontrol_t *kcontrol,
138} 138}
139 139
140 140
141static snd_kcontrol_new_t si3054_modem_mixer[] = { 141static struct snd_kcontrol_new si3054_modem_mixer[] = {
142 SI3054_KCONTROL("Off-hook Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_OH), 142 SI3054_KCONTROL("Off-hook Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_OH),
143 SI3054_KCONTROL("Caller ID Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_CID), 143 SI3054_KCONTROL("Caller ID Switch", SI3054_GPIO_CONTROL, SI3054_GPIO_CID),
144 {} 144 {}
@@ -158,7 +158,7 @@ static int si3054_pcm_prepare(struct hda_pcm_stream *hinfo,
158 struct hda_codec *codec, 158 struct hda_codec *codec,
159 unsigned int stream_tag, 159 unsigned int stream_tag,
160 unsigned int format, 160 unsigned int format,
161 snd_pcm_substream_t *substream) 161 struct snd_pcm_substream *substream)
162{ 162{
163 u16 val; 163 u16 val;
164 164
@@ -175,10 +175,10 @@ static int si3054_pcm_prepare(struct hda_pcm_stream *hinfo,
175 175
176static int si3054_pcm_open(struct hda_pcm_stream *hinfo, 176static int si3054_pcm_open(struct hda_pcm_stream *hinfo,
177 struct hda_codec *codec, 177 struct hda_codec *codec,
178 snd_pcm_substream_t *substream) 178 struct snd_pcm_substream *substream)
179{ 179{
180 static unsigned int rates[] = { 8000, 9600, 16000 }; 180 static unsigned int rates[] = { 8000, 9600, 16000 };
181 static snd_pcm_hw_constraint_list_t hw_constraints_rates = { 181 static struct snd_pcm_hw_constraint_list hw_constraints_rates = {
182 .count = ARRAY_SIZE(rates), 182 .count = ARRAY_SIZE(rates),
183 .list = rates, 183 .list = rates,
184 .mask = 0, 184 .mask = 0,