aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pcmcia/vx/vxpocket.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2005-11-17 08:46:59 -0500
committerJaroslav Kysela <perex@suse.cz>2006-01-03 06:18:42 -0500
commitaf26367f69a474ed809e4a59abb5855b47daaff4 (patch)
tree8ee9ec6449b3b51953cda3d546e90c064f963684 /sound/pcmcia/vx/vxpocket.c
parent9f38945fab04a0a0ea50880fa634f9bfa28f6226 (diff)
[ALSA] Remove xxx_t typedefs: VXdriver
Remove xxx_t typedefs from the VXdriver codes (vx_core support, vx222 and vxpocket). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pcmcia/vx/vxpocket.c')
-rw-r--r--sound/pcmcia/vx/vxpocket.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/sound/pcmcia/vx/vxpocket.c b/sound/pcmcia/vx/vxpocket.c
index 1e8f16b4c073..009629714140 100644
--- a/sound/pcmcia/vx/vxpocket.c
+++ b/sound/pcmcia/vx/vxpocket.c
@@ -83,9 +83,9 @@ static void vxpocket_release(dev_link_t *link)
83/* 83/*
84 * destructor, called from snd_card_free_in_thread() 84 * destructor, called from snd_card_free_in_thread()
85 */ 85 */
86static int snd_vxpocket_dev_free(snd_device_t *device) 86static int snd_vxpocket_dev_free(struct snd_device *device)
87{ 87{
88 vx_core_t *chip = device->device_data; 88 struct vx_core *chip = device->device_data;
89 89
90 snd_vx_free_firmware(chip); 90 snd_vx_free_firmware(chip);
91 kfree(chip); 91 kfree(chip);
@@ -142,19 +142,19 @@ static struct snd_vx_hardware vxp440_hw = {
142/* 142/*
143 * create vxpocket instance 143 * create vxpocket instance
144 */ 144 */
145static struct snd_vxpocket *snd_vxpocket_new(snd_card_t *card, int ibl) 145static struct snd_vxpocket *snd_vxpocket_new(struct snd_card *card, int ibl)
146{ 146{
147 client_reg_t client_reg; /* Register with cardmgr */ 147 client_reg_t client_reg; /* Register with cardmgr */
148 dev_link_t *link; /* Info for cardmgr */ 148 dev_link_t *link; /* Info for cardmgr */
149 vx_core_t *chip; 149 struct vx_core *chip;
150 struct snd_vxpocket *vxp; 150 struct snd_vxpocket *vxp;
151 int ret; 151 int ret;
152 static snd_device_ops_t ops = { 152 static struct snd_device_ops ops = {
153 .dev_free = snd_vxpocket_dev_free, 153 .dev_free = snd_vxpocket_dev_free,
154 }; 154 };
155 155
156 chip = snd_vx_create(card, &vxpocket_hw, &snd_vxpocket_ops, 156 chip = snd_vx_create(card, &vxpocket_hw, &snd_vxpocket_ops,
157 sizeof(struct snd_vxpocket) - sizeof(vx_core_t)); 157 sizeof(struct snd_vxpocket) - sizeof(struct vx_core));
158 if (! chip) 158 if (! chip)
159 return NULL; 159 return NULL;
160 160
@@ -218,10 +218,10 @@ static struct snd_vxpocket *snd_vxpocket_new(snd_card_t *card, int ibl)
218 * 218 *
219 * returns 0 if successful, or a negative error code. 219 * returns 0 if successful, or a negative error code.
220 */ 220 */
221static int snd_vxpocket_assign_resources(vx_core_t *chip, int port, int irq) 221static int snd_vxpocket_assign_resources(struct vx_core *chip, int port, int irq)
222{ 222{
223 int err; 223 int err;
224 snd_card_t *card = chip->card; 224 struct snd_card *card = chip->card;
225 struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; 225 struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip;
226 226
227 snd_printdd(KERN_DEBUG "vxpocket assign resources: port = 0x%x, irq = %d\n", port, irq); 227 snd_printdd(KERN_DEBUG "vxpocket assign resources: port = 0x%x, irq = %d\n", port, irq);
@@ -250,7 +250,7 @@ do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
250static void vxpocket_config(dev_link_t *link) 250static void vxpocket_config(dev_link_t *link)
251{ 251{
252 client_handle_t handle = link->handle; 252 client_handle_t handle = link->handle;
253 vx_core_t *chip = link->priv; 253 struct vx_core *chip = link->priv;
254 struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip; 254 struct snd_vxpocket *vxp = (struct snd_vxpocket *)chip;
255 tuple_t tuple; 255 tuple_t tuple;
256 cisparse_t *parse; 256 cisparse_t *parse;
@@ -324,7 +324,7 @@ failed:
324static int vxpocket_event(event_t event, int priority, event_callback_args_t *args) 324static int vxpocket_event(event_t event, int priority, event_callback_args_t *args)
325{ 325{
326 dev_link_t *link = args->client_data; 326 dev_link_t *link = args->client_data;
327 vx_core_t *chip = link->priv; 327 struct vx_core *chip = link->priv;
328 328
329 switch (event) { 329 switch (event) {
330 case CS_EVENT_CARD_REMOVAL: 330 case CS_EVENT_CARD_REMOVAL:
@@ -379,7 +379,7 @@ static int vxpocket_event(event_t event, int priority, event_callback_args_t *ar
379 */ 379 */
380static dev_link_t *vxpocket_attach(void) 380static dev_link_t *vxpocket_attach(void)
381{ 381{
382 snd_card_t *card; 382 struct snd_card *card;
383 struct snd_vxpocket *vxp; 383 struct snd_vxpocket *vxp;
384 int i; 384 int i;
385 385
@@ -421,14 +421,14 @@ static dev_link_t *vxpocket_attach(void)
421static void vxpocket_detach(dev_link_t *link) 421static void vxpocket_detach(dev_link_t *link)
422{ 422{
423 struct snd_vxpocket *vxp; 423 struct snd_vxpocket *vxp;
424 vx_core_t *chip; 424 struct vx_core *chip;
425 dev_link_t **linkp; 425 dev_link_t **linkp;
426 426
427 if (! link) 427 if (! link)
428 return; 428 return;
429 429
430 vxp = link->priv; 430 vxp = link->priv;
431 chip = (vx_core_t *)vxp; 431 chip = (struct vx_core *)vxp;
432 card_alloc &= ~(1 << vxp->index); 432 card_alloc &= ~(1 << vxp->index);
433 433
434 /* Remove the interface data from the linked list */ 434 /* Remove the interface data from the linked list */