diff options
Diffstat (limited to 'sound/core/device.c')
| -rw-r--r-- | sound/core/device.c | 47 |
1 files changed, 27 insertions, 20 deletions
diff --git a/sound/core/device.c b/sound/core/device.c index 1f509f56e60c..b1cf6ec56784 100644 --- a/sound/core/device.c +++ b/sound/core/device.c @@ -41,17 +41,19 @@ * * Returns zero if successful, or a negative error code on failure. */ -int snd_device_new(snd_card_t *card, snd_device_type_t type, - void *device_data, snd_device_ops_t *ops) +int snd_device_new(struct snd_card *card, snd_device_type_t type, + void *device_data, struct snd_device_ops *ops) { - snd_device_t *dev; + struct snd_device *dev; snd_assert(card != NULL, return -ENXIO); snd_assert(device_data != NULL, return -ENXIO); snd_assert(ops != NULL, return -ENXIO); dev = kzalloc(sizeof(*dev), GFP_KERNEL); - if (dev == NULL) + if (dev == NULL) { + snd_printk(KERN_ERR "Cannot allocate device\n"); return -ENOMEM; + } dev->card = card; dev->type = type; dev->state = SNDRV_DEV_BUILD; @@ -73,10 +75,10 @@ int snd_device_new(snd_card_t *card, snd_device_type_t type, * Returns zero if successful, or a negative error code on failure or if the * device not found. */ -int snd_device_free(snd_card_t *card, void *device_data) +int snd_device_free(struct snd_card *card, void *device_data) { struct list_head *list; - snd_device_t *dev; + struct snd_device *dev; snd_assert(card != NULL, return -ENXIO); snd_assert(device_data != NULL, return -ENXIO); @@ -86,7 +88,8 @@ int snd_device_free(snd_card_t *card, void *device_data) continue; /* unlink */ list_del(&dev->list); - if ((dev->state == SNDRV_DEV_REGISTERED || dev->state == SNDRV_DEV_DISCONNECTED) && + if ((dev->state == SNDRV_DEV_REGISTERED || + dev->state == SNDRV_DEV_DISCONNECTED) && dev->ops->dev_unregister) { if (dev->ops->dev_unregister(dev)) snd_printk(KERN_ERR "device unregister failure\n"); @@ -99,7 +102,8 @@ int snd_device_free(snd_card_t *card, void *device_data) kfree(dev); return 0; } - snd_printd("device free %p (from %p), not found\n", device_data, __builtin_return_address(0)); + snd_printd("device free %p (from %p), not found\n", device_data, + __builtin_return_address(0)); return -ENXIO; } @@ -116,10 +120,10 @@ int snd_device_free(snd_card_t *card, void *device_data) * Returns zero if successful, or a negative error code on failure or if the * device not found. */ -int snd_device_disconnect(snd_card_t *card, void *device_data) +int snd_device_disconnect(struct snd_card *card, void *device_data) { struct list_head *list; - snd_device_t *dev; + struct snd_device *dev; snd_assert(card != NULL, return -ENXIO); snd_assert(device_data != NULL, return -ENXIO); @@ -127,14 +131,16 @@ int snd_device_disconnect(snd_card_t *card, void *device_data) dev = snd_device(list); if (dev->device_data != device_data) continue; - if (dev->state == SNDRV_DEV_REGISTERED && dev->ops->dev_disconnect) { + if (dev->state == SNDRV_DEV_REGISTERED && + dev->ops->dev_disconnect) { if (dev->ops->dev_disconnect(dev)) snd_printk(KERN_ERR "device disconnect failure\n"); dev->state = SNDRV_DEV_DISCONNECTED; } return 0; } - snd_printd("device disconnect %p (from %p), not found\n", device_data, __builtin_return_address(0)); + snd_printd("device disconnect %p (from %p), not found\n", device_data, + __builtin_return_address(0)); return -ENXIO; } @@ -151,10 +157,10 @@ int snd_device_disconnect(snd_card_t *card, void *device_data) * Returns zero if successful, or a negative error code on failure or if the * device not found. */ -int snd_device_register(snd_card_t *card, void *device_data) +int snd_device_register(struct snd_card *card, void *device_data) { struct list_head *list; - snd_device_t *dev; + struct snd_device *dev; int err; snd_assert(card != NULL, return -ENXIO); @@ -169,6 +175,7 @@ int snd_device_register(snd_card_t *card, void *device_data) dev->state = SNDRV_DEV_REGISTERED; return 0; } + snd_printd("snd_device_register busy\n"); return -EBUSY; } snd_BUG(); @@ -179,10 +186,10 @@ int snd_device_register(snd_card_t *card, void *device_data) * register all the devices on the card. * called from init.c */ -int snd_device_register_all(snd_card_t *card) +int snd_device_register_all(struct snd_card *card) { struct list_head *list; - snd_device_t *dev; + struct snd_device *dev; int err; snd_assert(card != NULL, return -ENXIO); @@ -201,9 +208,9 @@ int snd_device_register_all(snd_card_t *card) * disconnect all the devices on the card. * called from init.c */ -int snd_device_disconnect_all(snd_card_t *card) +int snd_device_disconnect_all(struct snd_card *card) { - snd_device_t *dev; + struct snd_device *dev; struct list_head *list; int err = 0; @@ -220,9 +227,9 @@ int snd_device_disconnect_all(snd_card_t *card) * release all the devices on the card. * called from init.c */ -int snd_device_free_all(snd_card_t *card, snd_device_cmd_t cmd) +int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd) { - snd_device_t *dev; + struct snd_device *dev; struct list_head *list; int err; unsigned int range_low, range_high; |
