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>
This commit is contained in:
Родитель
20f1aae6cb
Коммит
0f9da5cb74
|
@ -281,7 +281,7 @@ static int __init cpm_init(void)
|
||||||
printk(KERN_ERR "cpm: could not parse dcr property for %s\n",
|
printk(KERN_ERR "cpm: could not parse dcr property for %s\n",
|
||||||
np->full_name);
|
np->full_name);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto out;
|
goto node_put;
|
||||||
}
|
}
|
||||||
|
|
||||||
cpm.dcr_host = dcr_map(np, dcr_base, dcr_len);
|
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",
|
printk(KERN_ERR "cpm: failed to map dcr property for %s\n",
|
||||||
np->full_name);
|
np->full_name);
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto out;
|
goto node_put;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* All 4xx SoCs with a CPM controller have one of two
|
/* 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)
|
if (cpm.standby || cpm.suspend)
|
||||||
suspend_set_ops(&cpm_suspend_ops);
|
suspend_set_ops(&cpm_suspend_ops);
|
||||||
|
node_put:
|
||||||
|
of_node_put(np);
|
||||||
out:
|
out:
|
||||||
if (np)
|
|
||||||
of_node_put(np);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче