[PATCH 1/1] dt: reform for_each_property to for_each_property_of_node_of_node

[PATCH 1/1] dt: reform for_each_property to for_each_property_of_node_of_node

[Dong Aisheng]

From: Dong Aisheng <dong.aisheng@linaro.org>

Make this micro more easy to use(do not need to pass properties, a node is
enough), also change to a more sensible name as for_each_child_of_node.

Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Shawn Guo <shawn.guo@freescale.com>
---
 drivers/of/base.c  |    2 +-
 include/linux/of.h |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/of/base.c b/drivers/of/base.c
index 9b6588e..f6f6fe8 100644
--- a/drivers/of/base.c
+++ b/drivers/of/base.c
@@ -1159,7 +1159,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 4948552..f1a490c 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);
-- 
1.7.0.4

[PATCH 1/1] dt: reform for_each_property to for_each_property_of_node_of_node

[Rob Herring]

On 12/20/2011 11:51 AM, Dong Aisheng wrote:
> From: Dong Aisheng <dong.aisheng@linaro.org>
> 
> Make this micro more easy to use(do not need to pass properties, a node is

Make this macro easier to use...

> enough), also change to a more sensible name as for_each_child_of_node.
> 
> Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Rob Herring <rob.herring@calxeda.com>
> Cc: Shawn Guo <shawn.guo@freescale.com>
> ---
>  drivers/of/base.c  |    2 +-
>  include/linux/of.h |    4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/of/base.c b/drivers/of/base.c
> index 9b6588e..f6f6fe8 100644
> --- a/drivers/of/base.c
> +++ b/drivers/of/base.c
> @@ -1159,7 +1159,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 4948552..f1a490c 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)

Probably should prepend it with "of_" while you're at it.

Rob

[PATCH 1/1] dt: reform for_each_property to for_each_property_of_node_of_node

[Dong Aisheng-B29396]

> -----Original Message-----
> From: Rob Herring [mailto:robherring2 at gmail.com]
> Sent: Wednesday, December 21, 2011 2:50 AM
> To: Dong Aisheng-B29396
> Cc: devicetree-discuss at lists.ozlabs.org; linux-kernel at vger.kernel.org; linux-
> arm-kernel at lists.infradead.org; grant.likely at secretlab.ca; Guo Shawn-R65073
> Subject: Re: [PATCH 1/1] dt: reform for_each_property to
> for_each_property_of_node_of_node
> Importance: High
> 
> 
> On 12/20/2011 11:51 AM, Dong Aisheng wrote:
> > From: Dong Aisheng <dong.aisheng@linaro.org>
> >
> > Make this micro more easy to use(do not need to pass properties, a
> > node is
> 
> Make this macro easier to use...
> 
Acked.

> > enough), also change to a more sensible name as for_each_child_of_node.
> >
> > Signed-off-by: Dong Aisheng <dong.aisheng@linaro.org>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Cc: Rob Herring <rob.herring@calxeda.com>
> > Cc: Shawn Guo <shawn.guo@freescale.com>
> > ---
> >  drivers/of/base.c  |    2 +-
> >  include/linux/of.h |    4 ++--
> >  2 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/of/base.c b/drivers/of/base.c index
> > 9b6588e..f6f6fe8 100644
> > --- a/drivers/of/base.c
> > +++ b/drivers/of/base.c
> > @@ -1159,7 +1159,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
> > 4948552..f1a490c 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)
> 
> Probably should prepend it with "of_" while you're at it.
> 
I agree.
But it seems other help microes also do not with a "of_" prefix
Like for_each_child_of_node.
So I just follow the old convention.
Do you think I need to change this one firstly?

Regards
Dong Aisheng