2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/of/base.c b/drivers/of/base.c
index b7072437eb8c..0181eeb88c92 100644
--- a/drivers/of/base.c
+++ b/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/include/linux/of.h b/include/linux/of.h
index 4948552d60f5..f1a490c37e06 100644
--- a/include/linux/of.h
+++ b/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);