diff options
| author | Julia Lawall <Julia.Lawall@lip6.fr> | 2014-08-08 12:07:44 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-10 09:59:34 +1100 |
| commit | 0f9da5cb746581ae2de120c78a8afe29fb594fe4 (patch) | |
| tree | 5891cd0e09aef023ab5c4158345213fff1d1bae5 | |
| parent | 20f1aae6cb0120fa54c0fe81614f6983df3b420a (diff) | |
| download | linux-0f9da5cb746581ae2de120c78a8afe29fb594fe4.tar.gz linux-0f9da5cb746581ae2de120c78a8afe29fb594fe4.tar.bz2 linux-0f9da5cb746581ae2de120c78a8afe29fb594fe4.zip | |
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>
| -rw-r--r-- | arch/powerpc/sysdev/ppc4xx_cpm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/sysdev/ppc4xx_cpm.c b/arch/powerpc/sysdev/ppc4xx_cpm.c index 82e2cfe35c62..ba95adf81d8d 100644 --- 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; } |