Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / sound / core / device.c

diff --git a/sound/core/device.c b/sound/core/device.c
index 18c71f9..b1cf6ec 100644 (file)
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -28,7 +28,7 @@
 /**
  * snd_device_new - create an ALSA device component
  * @card: the card instance
- * @type: the device type, SNDRV_DEV_TYPE_XXX
+ * @type: the device type, SNDRV_DEV_XXX
  * @device_data: the data pointer of this device
  * @ops: the operator table
  *
@@ -41,15 +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 && device_data != NULL && ops != NULL, return -ENXIO);
-       dev = kcalloc(1, sizeof(*dev), GFP_KERNEL);
-       if (dev == NULL)
+       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) {
+               snd_printk(KERN_ERR "Cannot allocate device\n");
                return -ENOMEM;
+       }
        dev->card = card;
        dev->type = type;
        dev->state = SNDRV_DEV_BUILD;
@@ -71,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);
@@ -84,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");
@@ -97,12 +102,13 @@ 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;
 }
 
 /**
- * snd_device_free - disconnect the device
+ * snd_device_disconnect - disconnect the device
  * @card: the card instance
  * @device_data: the data pointer to disconnect
  *
@@ -114,25 +120,27 @@ 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);
        list_for_each(list, &card->devices) {
                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;
 }
 
@@ -149,13 +157,14 @@ 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 && device_data != NULL, return -ENXIO);
+
+       snd_assert(card != NULL, return -ENXIO);
+       snd_assert(device_data != NULL, return -ENXIO);
        list_for_each(list, &card->devices) {
                dev = snd_device(list);
                if (dev->device_data != device_data)
@@ -166,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();
@@ -176,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);
@@ -198,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;
 
@@ -217,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;