---

yaml --- r: 280130 b: refs/heads/master c: 8af0da9 h: refs/heads/master v: v3
git-mirror · Dec 27, 2011 · 3fb8b3e · 3fb8b3e
1 parent 7839767
commit 3fb8b3e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b482c8360d368fd495685a2c69ca4f1e7b29764
+refs/heads/master: 8af0da93da7c40526959ab5291964581c678d3e7
diff --git a/trunk/drivers/of/base.c b/trunk/drivers/of/base.c
@@ -1157,7 +1157,7 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align))
 	if (!of_aliases)
 		return;
 
-	for_each_property(pp, of_aliases->properties) {
+	for_each_property_of_node(of_aliases, pp) {
 		const char *start = pp->name;
 		const char *end = start + strlen(start);
 		struct device_node *np;

diff --git a/trunk/include/linux/of.h b/trunk/include/linux/of.h
@@ -219,8 +219,8 @@ extern int of_device_is_available(const struct device_node *device);
 extern const void *of_get_property(const struct device_node *node,
 				const char *name,
 				int *lenp);
-#define for_each_property(pp, properties) \
-	for (pp = properties; pp != NULL; pp = pp->next)
+#define for_each_property_of_node(dn, pp) \
+	for (pp = dn->properties; pp != NULL; pp = pp->next)
 
 extern int of_n_addr_cells(struct device_node *np);
 extern int of_n_size_cells(struct device_node *np);