From 99e2f5e7b9a22d7f0edd46b63a38a6c182d5d172 Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Mon, 8 Oct 2012 16:15:26 -0600
Subject: [PATCH] --- yaml --- r: 334475 b: refs/heads/master c:
 205a8eb7ce713c7f1722297dd97d19dcea6f266c h: refs/heads/master i:   334473:
 7c4ce55944cc5324ef8d387e9d27bf6fc8b96676   334471:
 f23e9a96137edd3c8207e6c7063c70f6df7c4ce4 v: v3

---
 [refs]                  |  2 +-
 trunk/scripts/dtc/dtc.h | 44 ++++++++++-------------------------------
 2 files changed, 11 insertions(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index 4a1702ec1717..96bf7d52e919 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24fb530f990394915e8daceeca2a4a4e929e156f
+refs/heads/master: 205a8eb7ce713c7f1722297dd97d19dcea6f266c
diff --git a/trunk/scripts/dtc/dtc.h b/trunk/scripts/dtc/dtc.h
index d501c8605f26..3e42a071070e 100644
--- a/trunk/scripts/dtc/dtc.h
+++ b/trunk/scripts/dtc/dtc.h
@@ -161,51 +161,27 @@ struct node {
 	struct label *labels;
 };
 
-static inline struct label *for_each_label_next(struct label *l)
-{
-	do {
-		l = l->next;
-	} while (l && l->deleted);
-
-	return l;
-}
-
-#define for_each_label(l0, l) \
-	for ((l) = (l0); (l); (l) = for_each_label_next(l))
-
 #define for_each_label_withdel(l0, l) \
 	for ((l) = (l0); (l); (l) = (l)->next)
 
-static inline struct property *for_each_property_next(struct property *p)
-{
-	do {
-		p = p->next;
-	} while (p && p->deleted);
-
-	return p;
-}
-
-#define for_each_property(n, p) \
-	for ((p) = (n)->proplist; (p); (p) = for_each_property_next(p))
+#define for_each_label(l0, l) \
+	for_each_label_withdel(l0, l) \
+		if (!(l)->deleted)
 
 #define for_each_property_withdel(n, p) \
 	for ((p) = (n)->proplist; (p); (p) = (p)->next)
 
-static inline struct node *for_each_child_next(struct node *c)
-{
-	do {
-		c = c->next_sibling;
-	} while (c && c->deleted);
-
-	return c;
-}
-
-#define for_each_child(n, c) \
-	for ((c) = (n)->children; (c); (c) = for_each_child_next(c))
+#define for_each_property(n, p) \
+	for_each_property_withdel(n, p) \
+		if (!(p)->deleted)
 
 #define for_each_child_withdel(n, c) \
 	for ((c) = (n)->children; (c); (c) = (c)->next_sibling)
 
+#define for_each_child(n, c) \
+	for_each_child_withdel(n, c) \
+		if (!(c)->deleted)
+
 void add_label(struct label **labels, char *label);
 void delete_labels(struct label **labels);