powerpc/4xx/cpm: delete unneeded test before of_node_put

Simplify the error path to avoid calling of_node_put when it is not needed.

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c
index 82e2cfe35c62d4061c9a4bf94d40ce5e6313f150..ba95adf81d8d9dac32c40fffa3732bf4e092b927 100644 (file)
--- a/arch/powerpc/sysdev/ppc4xx_cpm.c
+++ b/arch/powerpc/sysdev/ppc4xx_cpm.c
@@ -281,7 +281,7 @@ static int __init cpm_init(void)
                printk(KERN_ERR "cpm: could not parse dcr property for %s\n",
                       np->full_name);
                ret = -EINVAL;
-               goto out;
+               goto node_put;
        }
 
        cpm.dcr_host = dcr_map(np, dcr_base, dcr_len);
@@ -290,7 +290,7 @@ static int __init cpm_init(void)
                printk(KERN_ERR "cpm: failed to map dcr property for %s\n",
                       np->full_name);
                ret = -EINVAL;
-               goto out;
+               goto node_put;
        }
 
        /* All 4xx SoCs with a CPM controller have one of two
@@ -330,9 +330,9 @@ static int __init cpm_init(void)
 
        if (cpm.standby || cpm.suspend)
                suspend_set_ops(&cpm_suspend_ops);
+node_put:
+       of_node_put(np);
 out:
-       if (np)
-               of_node_put(np);
        return ret;
 }