[PATCH] hlist_for_each_safe cleanup

Make code for hlist_for_each_safe use better code (same as
hlist_for_each_entry_safe).  Get rid of comment about prefetch, because
that was fixed a while ago.  Only current use of this is in the bridge
code, that I maintain.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/include/linux/list.h b/include/linux/list.h
index 23e287fe425957ecc4b5df9ad81ae430f8f34a05..92127ae0e995fdbcf272f7b811299ee0f69a68fd 100644 (file)
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -620,13 +620,12 @@ static inline void hlist_add_after(struct hlist_node *n,
 
 #define hlist_entry(ptr, type, member) container_of(ptr,type,member)
 
-/* Cannot easily do prefetch unfortunately */
 #define hlist_for_each(pos, head) \
        for (pos = (head)->first; pos && ({ prefetch(pos->next); 1; }); \
             pos = pos->next)
 
 #define hlist_for_each_safe(pos, n, head) \
-       for (pos = (head)->first; n = pos ? pos->next : NULL, pos; \
+       for (pos = (head)->first; pos && ({ n = pos->next; 1; }); \
             pos = n)
 
 /**