Patchwork [v2,2/7] dt/powerpc: Use of_get_child_by_name to get a named child.

login
register
mail settings
Submitter Srinivas KANDAGATLA
Date Sept. 14, 2012, 8:18 a.m.
Message ID <1347610724-20152-1-git-send-email-srinivas.kandagatla@st.com>
Download mbox | patch
Permalink /patch/183881/
State Superseded
Headers show

Comments

Srinivas KANDAGATLA - Sept. 14, 2012, 8:18 a.m.
From: Srinivas Kandagatla <srinivas.kandagatla@st.com>

As follow-up to "dt: introduce of_get_child_by_name to get child node by
name." patch, This patch removes some of the code duplication in the
driver by replacing it with of_get_child_by_name instead.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
---
 arch/powerpc/kernel/prom.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
Rob Herring - Sept. 14, 2012, 1:06 p.m.
On 09/14/2012 03:18 AM, Srinivas KANDAGATLA wrote:
> From: Srinivas Kandagatla <srinivas.kandagatla@st.com>
> 
> As follow-up to "dt: introduce of_get_child_by_name to get child node by
> name." patch, This patch removes some of the code duplication in the
> driver by replacing it with of_get_child_by_name instead.
> 
> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
> ---
>  arch/powerpc/kernel/prom.c |    5 +----
>  1 files changed, 1 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
> index f191bf0..80e5b6c 100644
> --- a/arch/powerpc/kernel/prom.c
> +++ b/arch/powerpc/kernel/prom.c
> @@ -735,7 +735,6 @@ void __init early_init_devtree(void *params)
>   */
>  struct device_node *of_find_next_cache_node(struct device_node *np)
>  {
> -	struct device_node *child;
>  	const phandle *handle;
>  
>  	handle = of_get_property(np, "l2-cache", NULL);
> @@ -749,9 +748,7 @@ struct device_node *of_find_next_cache_node(struct device_node *np)
>  	 * beneath CPU nodes.
>  	 */
>  	if (!strcmp(np->type, "cpu"))
> -		for_each_child_of_node(np, child)
> -			if (!strcmp(child->type, "cache"))

name and type are not the same thing.

Rob

> -				return child;
> +		return of_get_child_by_name(np, "cache");
>  
>  	return NULL;
>  }
>
Srinivas KANDAGATLA - Sept. 14, 2012, 1:15 p.m.
My bad...
Will skip this patch in next patch-set...


On 14/09/12 14:06, Rob Herring wrote:
> On 09/14/2012 03:18 AM, Srinivas KANDAGATLA wrote:
>> From: Srinivas Kandagatla <srinivas.kandagatla@st.com>
>>
>> As follow-up to "dt: introduce of_get_child_by_name to get child node by
>> name." patch, This patch removes some of the code duplication in the
>> driver by replacing it with of_get_child_by_name instead.
>>
>> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
>> ---
>>  arch/powerpc/kernel/prom.c |    5 +----
>>  1 files changed, 1 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
>> index f191bf0..80e5b6c 100644
>> --- a/arch/powerpc/kernel/prom.c
>> +++ b/arch/powerpc/kernel/prom.c
>> @@ -735,7 +735,6 @@ void __init early_init_devtree(void *params)
>>   */
>>  struct device_node *of_find_next_cache_node(struct device_node *np)
>>  {
>> -	struct device_node *child;
>>  	const phandle *handle;
>>  
>>  	handle = of_get_property(np, "l2-cache", NULL);
>> @@ -749,9 +748,7 @@ struct device_node *of_find_next_cache_node(struct device_node *np)
>>  	 * beneath CPU nodes.
>>  	 */
>>  	if (!strcmp(np->type, "cpu"))
>> -		for_each_child_of_node(np, child)
>> -			if (!strcmp(child->type, "cache"))
> name and type are not the same thing.
>
> Rob
>
>> -				return child;
>> +		return of_get_child_by_name(np, "cache");
>>  
>>  	return NULL;
>>  }
>>
>
>

Patch

diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index f191bf0..80e5b6c 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -735,7 +735,6 @@  void __init early_init_devtree(void *params)
  */
 struct device_node *of_find_next_cache_node(struct device_node *np)
 {
-	struct device_node *child;
 	const phandle *handle;
 
 	handle = of_get_property(np, "l2-cache", NULL);
@@ -749,9 +748,7 @@  struct device_node *of_find_next_cache_node(struct device_node *np)
 	 * beneath CPU nodes.
 	 */
 	if (!strcmp(np->type, "cpu"))
-		for_each_child_of_node(np, child)
-			if (!strcmp(child->type, "cache"))
-				return child;
+		return of_get_child_by_name(np, "cache");
 
 	return NULL;
 }