aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/ice1712/hoontech.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:59:52 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:19:11 -0500
commit6ca308d4edd51c4f34ffff94ae0bbf193087d89f (patch)
tree6bc0cb2ccacc6a4fd08cc35ecda4819e01f87af5 /sound/pci/ice1712/hoontech.c
parenta98f90fd826913519c3f704ea24fb9bea1e0e494 (diff)
[ALSA] Remove xxx_t typedefs: PCI ICE1712
Modules: ICE1712 driver Remove xxx_t typedefs from the PCI ICE1712 driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/ice1712/hoontech.c')
-rw-r--r--sound/pci/ice1712/hoontech.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/sound/pci/ice1712/hoontech.c b/sound/pci/ice1712/hoontech.c
index ab5fbd0bdfad..3f2f918536f5 100644
--- a/sound/pci/ice1712/hoontech.c
+++ b/sound/pci/ice1712/hoontech.c
@@ -33,7 +33,7 @@
33#include "hoontech.h" 33#include "hoontech.h"
34 34
35 35
36static void __devinit snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned char byte) 36static void __devinit snd_ice1712_stdsp24_gpio_write(struct snd_ice1712 *ice, unsigned char byte)
37{ 37{
38 byte |= ICE1712_STDSP24_CLOCK_BIT; 38 byte |= ICE1712_STDSP24_CLOCK_BIT;
39 udelay(100); 39 udelay(100);
@@ -46,7 +46,7 @@ static void __devinit snd_ice1712_stdsp24_gpio_write(ice1712_t *ice, unsigned ch
46 snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, byte); 46 snd_ice1712_write(ice, ICE1712_IREG_GPIO_DATA, byte);
47} 47}
48 48
49static void __devinit snd_ice1712_stdsp24_darear(ice1712_t *ice, int activate) 49static void __devinit snd_ice1712_stdsp24_darear(struct snd_ice1712 *ice, int activate)
50{ 50{
51 down(&ice->gpio_mutex); 51 down(&ice->gpio_mutex);
52 ICE1712_STDSP24_0_DAREAR(ice->spec.hoontech.boxbits, activate); 52 ICE1712_STDSP24_0_DAREAR(ice->spec.hoontech.boxbits, activate);
@@ -54,7 +54,7 @@ static void __devinit snd_ice1712_stdsp24_darear(ice1712_t *ice, int activate)
54 up(&ice->gpio_mutex); 54 up(&ice->gpio_mutex);
55} 55}
56 56
57static void __devinit snd_ice1712_stdsp24_mute(ice1712_t *ice, int activate) 57static void __devinit snd_ice1712_stdsp24_mute(struct snd_ice1712 *ice, int activate)
58{ 58{
59 down(&ice->gpio_mutex); 59 down(&ice->gpio_mutex);
60 ICE1712_STDSP24_3_MUTE(ice->spec.hoontech.boxbits, activate); 60 ICE1712_STDSP24_3_MUTE(ice->spec.hoontech.boxbits, activate);
@@ -62,7 +62,7 @@ static void __devinit snd_ice1712_stdsp24_mute(ice1712_t *ice, int activate)
62 up(&ice->gpio_mutex); 62 up(&ice->gpio_mutex);
63} 63}
64 64
65static void __devinit snd_ice1712_stdsp24_insel(ice1712_t *ice, int activate) 65static void __devinit snd_ice1712_stdsp24_insel(struct snd_ice1712 *ice, int activate)
66{ 66{
67 down(&ice->gpio_mutex); 67 down(&ice->gpio_mutex);
68 ICE1712_STDSP24_3_INSEL(ice->spec.hoontech.boxbits, activate); 68 ICE1712_STDSP24_3_INSEL(ice->spec.hoontech.boxbits, activate);
@@ -70,7 +70,7 @@ static void __devinit snd_ice1712_stdsp24_insel(ice1712_t *ice, int activate)
70 up(&ice->gpio_mutex); 70 up(&ice->gpio_mutex);
71} 71}
72 72
73static void __devinit snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, int chn, int activate) 73static void __devinit snd_ice1712_stdsp24_box_channel(struct snd_ice1712 *ice, int box, int chn, int activate)
74{ 74{
75 down(&ice->gpio_mutex); 75 down(&ice->gpio_mutex);
76 76
@@ -118,7 +118,7 @@ static void __devinit snd_ice1712_stdsp24_box_channel(ice1712_t *ice, int box, i
118 up(&ice->gpio_mutex); 118 up(&ice->gpio_mutex);
119} 119}
120 120
121static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int master) 121static void __devinit snd_ice1712_stdsp24_box_midi(struct snd_ice1712 *ice, int box, int master)
122{ 122{
123 down(&ice->gpio_mutex); 123 down(&ice->gpio_mutex);
124 124
@@ -144,7 +144,7 @@ static void __devinit snd_ice1712_stdsp24_box_midi(ice1712_t *ice, int box, int
144 up(&ice->gpio_mutex); 144 up(&ice->gpio_mutex);
145} 145}
146 146
147static void __devinit snd_ice1712_stdsp24_midi2(ice1712_t *ice, int activate) 147static void __devinit snd_ice1712_stdsp24_midi2(struct snd_ice1712 *ice, int activate)
148{ 148{
149 down(&ice->gpio_mutex); 149 down(&ice->gpio_mutex);
150 ICE1712_STDSP24_3_MIDI2(ice->spec.hoontech.boxbits, activate); 150 ICE1712_STDSP24_3_MIDI2(ice->spec.hoontech.boxbits, activate);
@@ -152,7 +152,7 @@ static void __devinit snd_ice1712_stdsp24_midi2(ice1712_t *ice, int activate)
152 up(&ice->gpio_mutex); 152 up(&ice->gpio_mutex);
153} 153}
154 154
155static int __devinit snd_ice1712_hoontech_init(ice1712_t *ice) 155static int __devinit snd_ice1712_hoontech_init(struct snd_ice1712 *ice)
156{ 156{
157 int box, chn; 157 int box, chn;
158 158
@@ -221,9 +221,9 @@ static int __devinit snd_ice1712_hoontech_init(ice1712_t *ice)
221 */ 221 */
222 222
223/* start callback for STDSP24 with modified hardware */ 223/* start callback for STDSP24 with modified hardware */
224static void stdsp24_ak4524_lock(akm4xxx_t *ak, int chip) 224static void stdsp24_ak4524_lock(struct snd_akm4xxx *ak, int chip)
225{ 225{
226 ice1712_t *ice = ak->private_data[0]; 226 struct snd_ice1712 *ice = ak->private_data[0];
227 unsigned char tmp; 227 unsigned char tmp;
228 snd_ice1712_save_gpio_status(ice); 228 snd_ice1712_save_gpio_status(ice);
229 tmp = ICE1712_STDSP24_SERIAL_DATA | 229 tmp = ICE1712_STDSP24_SERIAL_DATA |
@@ -234,10 +234,10 @@ static void stdsp24_ak4524_lock(akm4xxx_t *ak, int chip)
234 snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~tmp); 234 snd_ice1712_write(ice, ICE1712_IREG_GPIO_WRITE_MASK, ~tmp);
235} 235}
236 236
237static int __devinit snd_ice1712_value_init(ice1712_t *ice) 237static int __devinit snd_ice1712_value_init(struct snd_ice1712 *ice)
238{ 238{
239 /* Hoontech STDSP24 with modified hardware */ 239 /* Hoontech STDSP24 with modified hardware */
240 static akm4xxx_t akm_stdsp24_mv __devinitdata = { 240 static struct snd_akm4xxx akm_stdsp24_mv __devinitdata = {
241 .num_adcs = 2, 241 .num_adcs = 2,
242 .num_dacs = 2, 242 .num_dacs = 2,
243 .type = SND_AK4524, 243 .type = SND_AK4524,
@@ -258,7 +258,7 @@ static int __devinit snd_ice1712_value_init(ice1712_t *ice)
258 }; 258 };
259 259
260 int err; 260 int err;
261 akm4xxx_t *ak; 261 struct snd_akm4xxx *ak;
262 262
263 /* set the analog DACs */ 263 /* set the analog DACs */
264 ice->num_total_dacs = 2; 264 ice->num_total_dacs = 2;
@@ -267,7 +267,7 @@ static int __devinit snd_ice1712_value_init(ice1712_t *ice)
267 ice->num_total_adcs = 2; 267 ice->num_total_adcs = 2;
268 268
269 /* analog section */ 269 /* analog section */
270 ak = ice->akm = kmalloc(sizeof(akm4xxx_t), GFP_KERNEL); 270 ak = ice->akm = kmalloc(sizeof(struct snd_akm4xxx), GFP_KERNEL);
271 if (! ak) 271 if (! ak)
272 return -ENOMEM; 272 return -ENOMEM;
273 ice->akm_codecs = 1; 273 ice->akm_codecs = 1;
@@ -284,7 +284,7 @@ static int __devinit snd_ice1712_value_init(ice1712_t *ice)
284 return 0; 284 return 0;
285} 285}
286 286
287static int __devinit snd_ice1712_ez8_init(ice1712_t *ice) 287static int __devinit snd_ice1712_ez8_init(struct snd_ice1712 *ice)
288{ 288{
289 ice->gpio.write_mask = ice->eeprom.gpiomask; 289 ice->gpio.write_mask = ice->eeprom.gpiomask;
290 ice->gpio.direction = ice->eeprom.gpiodir; 290 ice->gpio.direction = ice->eeprom.gpiodir;