[PATCH 0/2] arm: mvebu: two simple cleanups

[PATCH 0/2] arm: mvebu: two simple cleanups

[Martin Kaiser]

Two small patches that simplify the devicetree parsing in
arch/arm/mach-mvebu/coherency.c.

Martin Kaiser (2):
  ARM: mvebu: drop unnecessary NULL check
  ARM: mvebu: simplify of_node_put calls

 arch/arm/mach-mvebu/coherency.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

-- 
2.43.7

[PATCH 1/2] ARM: mvebu: drop unnecessary NULL check

[Martin Kaiser]

Don't check the returned pointer from of_find_compatible_node.
We pass this pointer to of_iomap, which handles np==NULL  correctly.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 arch/arm/mach-mvebu/coherency.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index fa2c1e1aeb96..a8288a29c1f5 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -133,8 +133,6 @@ static void __init armada_370_coherency_init(struct device_node *np)
 
 	cpu_config_np = of_find_compatible_node(NULL, NULL,
 						"marvell,armada-xp-cpu-config");
-	if (!cpu_config_np)
-		goto exit;
 
 	cpu_config_base = of_iomap(cpu_config_np, 0);
 	if (!cpu_config_base) {
-- 
2.43.7

[PATCH 2/2] ARM: mvebu: simplify of_node_put calls

[Martin Kaiser]

In armada_370_coherency_init, cpu_config_np is no longer needed after
of_iomap. We can call of_node_put earlier and summarize the two calls.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
 arch/arm/mach-mvebu/coherency.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/arch/arm/mach-mvebu/coherency.c b/arch/arm/mach-mvebu/coherency.c
index a8288a29c1f5..f27b4ec13df2 100644
--- a/arch/arm/mach-mvebu/coherency.c
+++ b/arch/arm/mach-mvebu/coherency.c
@@ -135,12 +135,9 @@ static void __init armada_370_coherency_init(struct device_node *np)
 						"marvell,armada-xp-cpu-config");
 
 	cpu_config_base = of_iomap(cpu_config_np, 0);
-	if (!cpu_config_base) {
-		of_node_put(cpu_config_np);
-		goto exit;
-	}
-
 	of_node_put(cpu_config_np);
+	if (!cpu_config_base)
+		goto exit;
 
 	cpuhp_setup_state_nocalls(CPUHP_AP_ARM_MVEBU_COHERENCY,
 				  "arm/mvebu/coherency:starting",
-- 
2.43.7

Re: [PATCH 0/2] arm: mvebu: two simple cleanups

[Gregory CLEMENT]

Martin Kaiser <martin@kaiser.cx> writes:

> Two small patches that simplify the devicetree parsing in
> arch/arm/mach-mvebu/coherency.c.
>
> Martin Kaiser (2):
>   ARM: mvebu: drop unnecessary NULL check
>   ARM: mvebu: simplify of_node_put calls
>

Applied on mvebu/arm

Thanks,

Gregory

>  arch/arm/mach-mvebu/coherency.c | 9 ++-------
>  1 file changed, 2 insertions(+), 7 deletions(-)
>
> -- 
> 2.43.7
>

-- 
Grégory CLEMENT, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com