hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

phy: cygnus: pcie: add missing of_node_put 

for_each_available_child_of_node performs an of_node_get on each iteration,
so a return from the middle of the loop requires an of_node_put.

A simplified version of the semantic patch that finds this problem is as
follows (http://coccinelle.lip6.fr):

// <smpl>
@@
expression root,e;
local idexpression child;
@@

 for_each_available_child_of_node(root, child) {
   ... when != of_node_put(child)
       when != e = child
(
   return child;
|
*  return ...;
)
   ...
 }
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
Julia Lawall 2015-11-16 12:33:20 +01:00 committed by Kishon Vijay Abraham I
parent 39c2b96422
commit a8c24724dd
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/phy/phy-bcm-cygnus-pcie.c
View File

@ -128,6 +128,7 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
struct phy_provider *provider; struct phy_provider *provider;
struct resource *res; struct resource *res;
unsigned cnt = 0; unsigned cnt = 0;
int ret;
if (of_get_child_count(node) == 0) { if (of_get_child_count(node) == 0) {
dev_err(dev, "PHY no child node\n"); dev_err(dev, "PHY no child node\n");
@ -154,24 +155,28 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
if (of_property_read_u32(child, "reg", &id)) { if (of_property_read_u32(child, "reg", &id)) {
dev_err(dev, "missing reg property for %s\n", dev_err(dev, "missing reg property for %s\n",
child->name); child->name);
return -EINVAL; ret = -EINVAL;
goto put_child;
} }
if (id >= MAX_NUM_PHYS) { if (id >= MAX_NUM_PHYS) {
dev_err(dev, "invalid PHY id: %u\n", id); dev_err(dev, "invalid PHY id: %u\n", id);
return -EINVAL; ret = -EINVAL;
goto put_child;
} }
if (core->phys[id].phy) { if (core->phys[id].phy) {
dev_err(dev, "duplicated PHY id: %u\n", id); dev_err(dev, "duplicated PHY id: %u\n", id);
return -EINVAL; ret = -EINVAL;
goto put_child;
} }
p = &core->phys[id]; p = &core->phys[id];
p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops); p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops);
if (IS_ERR(p->phy)) { if (IS_ERR(p->phy)) {
dev_err(dev, "failed to create PHY\n"); dev_err(dev, "failed to create PHY\n");
return PTR_ERR(p->phy); ret = PTR_ERR(p->phy);
goto put_child;
} }
p->core = core; p->core = core;
@ -191,6 +196,9 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt); dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt);
return 0; return 0;
put_child:
of_node_put(child);
return ret;
} }
static const struct of_device_id cygnus_pcie_phy_match_table[] = { static const struct of_device_id cygnus_pcie_phy_match_table[] = {