lkml.org 
[lkml]   [2014]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 11/14] ARM: brcmstb: delete unneeded test before of_node_put
Hi Julia,

On Fri, Aug 08, 2014 at 12:07:52PM +0200, Julia Lawall wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> Simplify the error path to avoid calling of_node_put when it is not needed.
>
> The semantic patch that finds this problem is as follows:
> (http://coccinelle.lip6.fr/)
>
> // <smpl>
> @@
> expression e;
> @@
>
> -if (e)
> of_node_put(e);
> // </smpl>
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
>
> ---
> arch/arm/mach-bcm/platsmp-brcmstb.c | 14 ++++++--------

This file is being dropped temporarily, for rework/resubmission at a
later time:

https://lkml.org/lkml/2014/8/13/617

But thanks for the patch. I'll take it into account in the future. A few
comments below.

> 1 file changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-bcm/platsmp-brcmstb.c b/arch/arm/mach-bcm/platsmp-brcmstb.c
> index af780e9..c515ea1 100644
> --- a/arch/arm/mach-bcm/platsmp-brcmstb.c
> +++ b/arch/arm/mach-bcm/platsmp-brcmstb.c
> @@ -227,7 +227,7 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
> if (!syscon_np) {
> pr_err("can't find phandle %s\n", name);
> rc = -EINVAL;
> - goto cleanup;
> + goto out;
> }
>
> cpubiuctrl_block = of_iomap(syscon_np, 0);
> @@ -256,9 +256,8 @@ static int __init setup_hifcpubiuctrl_regs(struct device_node *np)
> }
>
> cleanup:
> - if (syscon_np)
> - of_node_put(syscon_np);
> -
> + of_node_put(syscon_np);
> +out:

Is there a good reason for this new label? I thought part of the point
of this semantic patch is that the previous line (of_node_put()) is a
no-op for NULL arguments.

> return rc;
> }
>
> @@ -274,7 +273,7 @@ static int __init setup_hifcont_regs(struct device_node *np)
> if (!syscon_np) {
> pr_err("can't find phandle %s\n", name);
> rc = -EINVAL;
> - goto cleanup;
> + goto out;
> }
>
> hif_cont_block = of_iomap(syscon_np, 0);
> @@ -288,9 +287,8 @@ static int __init setup_hifcont_regs(struct device_node *np)
> hif_cont_reg = 0;
>
> cleanup:
> - if (syscon_np)
> - of_node_put(syscon_np);
> -
> + of_node_put(syscon_np);
> +out:

Ditto.

> return rc;
> }
>
>

Brian


\
 
 \ /
  Last update: 2014-08-14 00:41    [W:0.068 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site