Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Julia Lawall and committed by
Michael Ellerman
0f9da5cb 20f1aae6

+4 -4
+4 -4
arch/powerpc/sysdev/ppc4xx_cpm.c
··· 281 281 printk(KERN_ERR "cpm: could not parse dcr property for %s\n", 282 282 np->full_name); 283 283 ret = -EINVAL; 284 - goto out; 284 + goto node_put; 285 285 } 286 286 287 287 cpm.dcr_host = dcr_map(np, dcr_base, dcr_len); ··· 290 290 printk(KERN_ERR "cpm: failed to map dcr property for %s\n", 291 291 np->full_name); 292 292 ret = -EINVAL; 293 - goto out; 293 + goto node_put; 294 294 } 295 295 296 296 /* All 4xx SoCs with a CPM controller have one of two ··· 330 330 331 331 if (cpm.standby || cpm.suspend) 332 332 suspend_set_ops(&cpm_suspend_ops); 333 + node_put: 334 + of_node_put(np); 333 335 out: 334 - if (np) 335 - of_node_put(np); 336 336 return ret; 337 337 } 338 338