[ALSA] alsa core: convert to list_for_each_entry*

This patch converts most uses of list_for_each to list_for_each_entry all
across alsa. In some place apparently an item can be on a list with
different pointers so of course that isn't compatible with list_for_each, I
therefore didn't touch those places.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

1 files changed, 6 insertions, 18 deletions

diff --git a/sound/core/device.c b/sound/core/device.c
index ccb25816ac9..5858b02b0b1 100644
--- a/sound/core/device.c
+++ b/sound/core/device.c
@@ -79,13 +79,11 @@ EXPORT_SYMBOL(snd_device_new);
  */
 int snd_device_free(struct snd_card *card, void *device_data)
 {
-        struct list_head *list;
         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);
+        list_for_each_entry(dev, &card->devices, list) {
                 if (dev->device_data != device_data)
                         continue;
                 /* unlink */
@@ -124,13 +122,11 @@ EXPORT_SYMBOL(snd_device_free);
  */
 int snd_device_disconnect(struct snd_card *card, void *device_data)
 {
-        struct list_head *list;
         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);
+        list_for_each_entry(dev, &card->devices, list) {
                 if (dev->device_data != device_data)
                         continue;
                 if (dev->state == SNDRV_DEV_REGISTERED &&
@@ -161,14 +157,12 @@ int snd_device_disconnect(struct snd_card *card, void *device_data)
  */
 int snd_device_register(struct snd_card *card, void *device_data)
 {
-        struct list_head *list;
         struct snd_device *dev;
         int err;
 
         snd_assert(card != NULL, return -ENXIO);
         snd_assert(device_data != NULL, return -ENXIO);
-        list_for_each(list, &card->devices) {
-                dev = snd_device(list);
+        list_for_each_entry(dev, &card->devices, list) {
                 if (dev->device_data != device_data)
                         continue;
                 if (dev->state == SNDRV_DEV_BUILD && dev->ops->dev_register) {
@@ -192,13 +186,11 @@ EXPORT_SYMBOL(snd_device_register);
  */
 int snd_device_register_all(struct snd_card *card)
 {
-        struct list_head *list;
         struct snd_device *dev;
         int err;
         
         snd_assert(card != NULL, return -ENXIO);
-        list_for_each(list, &card->devices) {
-                dev = snd_device(list);
+        list_for_each_entry(dev, &card->devices, list) {
                 if (dev->state == SNDRV_DEV_BUILD && dev->ops->dev_register) {
                         if ((err = dev->ops->dev_register(dev)) < 0)
                                 return err;
@@ -215,12 +207,10 @@ int snd_device_register_all(struct snd_card *card)
 int snd_device_disconnect_all(struct snd_card *card)
 {
         struct snd_device *dev;
-        struct list_head *list;
         int err = 0;
 
         snd_assert(card != NULL, return -ENXIO);
-        list_for_each(list, &card->devices) {
-                dev = snd_device(list);
+        list_for_each_entry(dev, &card->devices, list) {
                 if (snd_device_disconnect(card, dev->device_data) < 0)
                         err = -ENXIO;
         }
@@ -234,7 +224,6 @@ int snd_device_disconnect_all(struct snd_card *card)
 int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd)
 {
         struct snd_device *dev;
-        struct list_head *list;
         int err;
         unsigned int range_low, range_high;
 
@@ -242,8 +231,7 @@ int snd_device_free_all(struct snd_card *card, snd_device_cmd_t cmd)
         range_low = cmd * SNDRV_DEV_TYPE_RANGE_SIZE;
         range_high = range_low + SNDRV_DEV_TYPE_RANGE_SIZE - 1;
       __again:
-        list_for_each(list, &card->devices) {
-                dev = snd_device(list);         
+        list_for_each_entry(dev, &card->devices, list) {
                 if (dev->type >= range_low && dev->type <= range_high) {
                         if ((err = snd_device_free(card, dev->device_data)) < 0)
                                 return err;