devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] of: Use NULL for pointers
@ 2014-04-02  7:47 Thierry Reding
       [not found] ` <1396424821-1963-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
  0 siblings, 1 reply; 2+ messages in thread
From: Thierry Reding @ 2014-04-02  7:47 UTC (permalink / raw)
  To: Grant Likely, Rob Herring; +Cc: devicetree-u79uwXL29TY76Z2rM5mHXA

Commit 4485681939b9 (of/fdt: Clean up casting in unflattening path)
modified unflatten_dt_node() to take a void * for the mem parameter
instead of an unsigned long. One of the call sites wasn't updated.

Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/of/fdt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index fa16a912a927..383c6e665d13 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -385,7 +385,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob,
 
 	/* First pass, scan for size */
 	start = ((void *)blob) + be32_to_cpu(blob->off_dt_struct);
-	size = (unsigned long)unflatten_dt_node(blob, 0, &start, NULL, NULL, 0);
+	size = (unsigned long)unflatten_dt_node(blob, NULL, &start, NULL, NULL,
+						0);
 	size = ALIGN(size, 4);
 
 	pr_debug("  size is %lx, allocating...\n", size);
-- 
1.9.1


-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information.  Any unauthorized review, use, disclosure or distribution
is prohibited.  If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------
--
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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] of: Use NULL for pointers
       [not found] ` <1396424821-1963-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
@ 2014-04-02 12:48   ` Grant Likely
  0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2014-04-02 12:48 UTC (permalink / raw)
  To: Thierry Reding, Rob Herring; +Cc: devicetree-u79uwXL29TY76Z2rM5mHXA

On Wed, 2 Apr 2014 09:47:01 +0200, Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> wrote:
> Commit 4485681939b9 (of/fdt: Clean up casting in unflattening path)
> modified unflatten_dt_node() to take a void * for the mem parameter
> instead of an unsigned long. One of the call sites wasn't updated.
> 
> Signed-off-by: Thierry Reding <treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Applied, thanks, but removed new line split. Sometimes keeping the 80
column limit just isn't worth it.  :-)

g.

> ---
>  drivers/of/fdt.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
> index fa16a912a927..383c6e665d13 100644
> --- a/drivers/of/fdt.c
> +++ b/drivers/of/fdt.c
> @@ -385,7 +385,8 @@ static void __unflatten_device_tree(struct boot_param_header *blob,
>  
>  	/* First pass, scan for size */
>  	start = ((void *)blob) + be32_to_cpu(blob->off_dt_struct);
> -	size = (unsigned long)unflatten_dt_node(blob, 0, &start, NULL, NULL, 0);
> +	size = (unsigned long)unflatten_dt_node(blob, NULL, &start, NULL, NULL,
> +						0);
>  	size = ALIGN(size, 4);
>  
>  	pr_debug("  size is %lx, allocating...\n", size);
> -- 
> 1.9.1
> 
> 
> -----------------------------------------------------------------------------------
> This email message is for the sole use of the intended recipient(s) and may contain
> confidential information.  Any unauthorized review, use, disclosure or distribution
> is prohibited.  If you are not the intended recipient, please contact the sender by
> reply email and destroy all copies of the original message.
> -----------------------------------------------------------------------------------

--
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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-04-02 12:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-02  7:47 [PATCH] of: Use NULL for pointers Thierry Reding
     [not found] ` <1396424821-1963-1-git-send-email-treding-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2014-04-02 12:48   ` Grant Likely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).