[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, 10 insertions, 19 deletions

diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c
index 0f055bfcbdac..7e6ceec738d5 100644
--- a/sound/core/rawmidi.c
+++ b/sound/core/rawmidi.c
@@ -61,14 +61,11 @@ static DEFINE_MUTEX(register_mutex);
 
 static struct snd_rawmidi *snd_rawmidi_search(struct snd_card *card, int device)
 {
-        struct list_head *p;
         struct snd_rawmidi *rawmidi;
 
-        list_for_each(p, &snd_rawmidi_devices) {
-                rawmidi = list_entry(p, struct snd_rawmidi, list);
+        list_for_each_entry(rawmidi, &snd_rawmidi_devices, list)
                 if (rawmidi->card == card && rawmidi->device == device)
                         return rawmidi;
-        }
         return NULL;
 }
 
@@ -389,7 +386,6 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
         struct snd_rawmidi *rmidi;
         struct snd_rawmidi_file *rawmidi_file;
         wait_queue_t wait;
-        struct list_head *list;
         struct snd_ctl_file *kctl;
 
         if (maj == snd_major) {
@@ -426,8 +422,7 @@ static int snd_rawmidi_open(struct inode *inode, struct file *file)
         while (1) {
                 subdevice = -1;
                 down_read(&card->controls_rwsem);
-                list_for_each(list, &card->ctl_files) {
-                        kctl = snd_ctl_file(list);
+                list_for_each_entry(kctl, &card->ctl_files, list) {
                         if (kctl->pid == current->pid) {
                                 subdevice = kctl->prefer_rawmidi_subdevice;
                                 if (subdevice != -1)
@@ -575,7 +570,6 @@ int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info
         struct snd_rawmidi *rmidi;
         struct snd_rawmidi_str *pstr;
         struct snd_rawmidi_substream *substream;
-        struct list_head *list;
 
         mutex_lock(&register_mutex);
         rmidi = snd_rawmidi_search(card, info->device);
@@ -589,8 +583,7 @@ int snd_rawmidi_info_select(struct snd_card *card, struct snd_rawmidi_info *info
                 return -ENOENT;
         if (info->subdevice >= pstr->substream_count)
                 return -ENXIO;
-        list_for_each(list, &pstr->substreams) {
-                substream = list_entry(list, struct snd_rawmidi_substream, list);
+        list_for_each_entry(substream, &pstr->substreams, list) {
                 if ((unsigned int)substream->number == info->subdevice)
                         return snd_rawmidi_info(substream, info);
         }
@@ -1313,14 +1306,14 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,
         struct snd_rawmidi *rmidi;
         struct snd_rawmidi_substream *substream;
         struct snd_rawmidi_runtime *runtime;
-        struct list_head *list;
 
         rmidi = entry->private_data;
         snd_iprintf(buffer, "%s\n\n", rmidi->name);
         mutex_lock(&rmidi->open_mutex);
         if (rmidi->info_flags & SNDRV_RAWMIDI_INFO_OUTPUT) {
-                list_for_each(list, &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams) {
-                        substream = list_entry(list, struct snd_rawmidi_substream, list);
+                list_for_each_entry(substream,
+                                    &rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT].substreams,
+                                    list) {
                         snd_iprintf(buffer,
                                     "Output %d\n"
                                     "  Tx bytes     : %lu\n",
@@ -1339,8 +1332,9 @@ static void snd_rawmidi_proc_info_read(struct snd_info_entry *entry,
                 }
         }
         if (rmidi->info_flags & SNDRV_RAWMIDI_INFO_INPUT) {
-                list_for_each(list, &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams) {
-                        substream = list_entry(list, struct snd_rawmidi_substream, list);
+                list_for_each_entry(substream,
+                                    &rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT].substreams,
+                                    list) {
                         snd_iprintf(buffer,
                                     "Input %d\n"
                                     "  Rx bytes     : %lu\n",
@@ -1625,13 +1619,10 @@ static int snd_rawmidi_dev_disconnect(struct snd_device *device)
 void snd_rawmidi_set_ops(struct snd_rawmidi *rmidi, int stream,
                          struct snd_rawmidi_ops *ops)
 {
-        struct list_head *list;
         struct snd_rawmidi_substream *substream;
         
-        list_for_each(list, &rmidi->streams[stream].substreams) {
-                substream = list_entry(list, struct snd_rawmidi_substream, list);
+        list_for_each_entry(substream, &rmidi->streams[stream].substreams, list)
                 substream->ops = ops;
-        }
 }
 
 /*