[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Date: Fri, 8 Aug 2014 12:07:52 +0200
From: Julia Lawall <Julia.Lawall@...6.fr>
To: Marc Carino <marc.ceeeee@...il.com>
Cc: kernel-janitors@...r.kernel.org,
Brian Norris <computersforpeace@...il.com>,
Christian Daudt <bcm@...thebug.org>,
Matt Porter <mporter@...aro.org>,
Russell King <linux@....linux.org.uk>,
linux-arm-kernel@...ts.infradead.org,
bcm-kernel-feedback-list@...adcom.com,
linux-kernel@...r.kernel.org,
Uwe Kleine-König
<u.kleine-koenig@...gutronix.de>
Subject: [PATCH 11/14] ARM: brcmstb: delete unneeded test before of_node_put
From: Julia Lawall <Julia.Lawall@...6.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@...6.fr>
---
arch/arm/mach-bcm/platsmp-brcmstb.c | 14 ++++++--------
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:
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:
return rc;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists