[PATCH 0/2] Trivial code cleanup for DT resolver

[PATCH 0/2] Trivial code cleanup for DT resolver

[Stephen Boyd]

Two trivial patches to the DT resolver code.

Stephen Boyd (2):
  of/resolver: Simplify to be32_add_cpu()
  of/resolver: Replace kmalloc + memcpy with kmemdup()

 drivers/of/resolver.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

-- 
2.14.GIT

[PATCH 1/2] of/resolver: Simplify to be32_add_cpu()

[Stephen Boyd]

This is the same as be32_add_cpu(), so simplify the code and
remove the now unused local variable.

Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
---
 drivers/of/resolver.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 99309cb7d372..2d58253bf2f7 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -165,7 +165,6 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
 	struct property *prop_fix, *prop;
 	int err, i, count;
 	unsigned int off;
-	phandle phandle;
 
 	if (!local_fixups)
 		return 0;
@@ -195,9 +194,7 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
 			if ((off + 4) > prop->length)
 				return -EINVAL;
 
-			phandle = be32_to_cpu(*(__be32 *)(prop->value + off));
-			phandle += phandle_delta;
-			*(__be32 *)(prop->value + off) = cpu_to_be32(phandle);
+			be32_add_cpu(prop->value + off, phandle_delta);
 		}
 	}
 
-- 
2.14.GIT

[PATCH 2/2] of/resolver: Replace kmalloc + memcpy with kmemdup()

[Stephen Boyd]

Save one line.

Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org>
---
 drivers/of/resolver.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
index 2d58253bf2f7..bd21a66f6930 100644
--- a/drivers/of/resolver.c
+++ b/drivers/of/resolver.c
@@ -84,10 +84,9 @@ static int update_usages_of_a_phandle_reference(struct device_node *overlay,
 	int offset, len;
 	int err = 0;
 
-	value = kmalloc(prop_fixup->length, GFP_KERNEL);
+	value = kmemdup(prop_fixup->value, prop_fixup->length, GFP_KERNEL);
 	if (!value)
 		return -ENOMEM;
-	memcpy(value, prop_fixup->value, prop_fixup->length);
 
 	/* prop_fixup contains a list of tuples of path:property_name:offset */
 	end = value + prop_fixup->length;
-- 
2.14.GIT

Re: [PATCH 2/2] of/resolver: Replace kmalloc + memcpy with kmemdup()

[Frank Rowand]

On 10/13/17 00:35, Stephen Boyd wrote:
> Save one line.
> 
> Signed-off-by: Stephen Boyd <stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  drivers/of/resolver.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
> index 2d58253bf2f7..bd21a66f6930 100644
> --- a/drivers/of/resolver.c
> +++ b/drivers/of/resolver.c
> @@ -84,10 +84,9 @@ static int update_usages_of_a_phandle_reference(struct device_node *overlay,
>  	int offset, len;
>  	int err = 0;
>  
> -	value = kmalloc(prop_fixup->length, GFP_KERNEL);
> +	value = kmemdup(prop_fixup->value, prop_fixup->length, GFP_KERNEL);
>  	if (!value)
>  		return -ENOMEM;
> -	memcpy(value, prop_fixup->value, prop_fixup->length);
>  
>  	/* prop_fixup contains a list of tuples of path:property_name:offset */
>  	end = value + prop_fixup->length;
> 

Reviewed-by: Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 1/2] of/resolver: Simplify to be32_add_cpu()

[Frank Rowand]

On 10/13/17 00:35, Stephen Boyd wrote:
> This is the same as be32_add_cpu(), so simplify the code and
> remove the now unused local variable.
> 
> Signed-off-by: Stephen Boyd <stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  drivers/of/resolver.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/of/resolver.c b/drivers/of/resolver.c
> index 99309cb7d372..2d58253bf2f7 100644
> --- a/drivers/of/resolver.c
> +++ b/drivers/of/resolver.c
> @@ -165,7 +165,6 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
>  	struct property *prop_fix, *prop;
>  	int err, i, count;
>  	unsigned int off;
> -	phandle phandle;
>  
>  	if (!local_fixups)
>  		return 0;
> @@ -195,9 +194,7 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,
>  			if ((off + 4) > prop->length)
>  				return -EINVAL;
>  
> -			phandle = be32_to_cpu(*(__be32 *)(prop->value + off));
> -			phandle += phandle_delta;
> -			*(__be32 *)(prop->value + off) = cpu_to_be32(phandle);
> +			be32_add_cpu(prop->value + off, phandle_delta);
>  		}
>  	}
>  
> 

Reviewed-by: Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/2] of/resolver: Replace kmalloc + memcpy with kmemdup()

[Rob Herring]

On Fri, Oct 13, 2017 at 12:35:58AM -0700, Stephen Boyd wrote:
> Save one line.
> 
> Signed-off-by: Stephen Boyd <stephen.boyd-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  drivers/of/resolver.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)

Both applied. Thanks.

Rob
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html