Skip to content

Commit be565ec

Browse files
Wang Qingdavem330
authored andcommitted
net: ethernet: ti: add missing of_node_put before return
Fix following coccicheck warning: WARNING: Function "for_each_child_of_node" should have of_node_put() before return. Early exits from for_each_child_of_node should decrement the node reference counter. Signed-off-by: Wang Qing <wangqing@vivo.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 71da1ae commit be565ec

File tree

1 file changed

+20
-9
lines changed

1 file changed

+20
-9
lines changed

drivers/net/ethernet/ti/am65-cpsw-nuss.c

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1844,13 +1844,14 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
18441844
if (ret < 0) {
18451845
dev_err(dev, "%pOF error reading port_id %d\n",
18461846
port_np, ret);
1847-
return ret;
1847+
goto of_node_put;
18481848
}
18491849

18501850
if (!port_id || port_id > common->port_num) {
18511851
dev_err(dev, "%pOF has invalid port_id %u %s\n",
18521852
port_np, port_id, port_np->name);
1853-
return -EINVAL;
1853+
ret = -EINVAL;
1854+
goto of_node_put;
18541855
}
18551856

18561857
port = am65_common_get_port(common, port_id);
@@ -1866,8 +1867,10 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
18661867
(AM65_CPSW_NU_FRAM_PORT_OFFSET * (port_id - 1));
18671868

18681869
port->slave.mac_sl = cpsw_sl_get("am65", dev, port->port_base);
1869-
if (IS_ERR(port->slave.mac_sl))
1870-
return PTR_ERR(port->slave.mac_sl);
1870+
if (IS_ERR(port->slave.mac_sl)) {
1871+
ret = PTR_ERR(port->slave.mac_sl);
1872+
goto of_node_put;
1873+
}
18711874

18721875
port->disabled = !of_device_is_available(port_np);
18731876
if (port->disabled) {
@@ -1880,7 +1883,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
18801883
ret = PTR_ERR(port->slave.ifphy);
18811884
dev_err(dev, "%pOF error retrieving port phy: %d\n",
18821885
port_np, ret);
1883-
return ret;
1886+
goto of_node_put;
18841887
}
18851888

18861889
port->slave.mac_only =
@@ -1889,10 +1892,12 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
18891892
/* get phy/link info */
18901893
if (of_phy_is_fixed_link(port_np)) {
18911894
ret = of_phy_register_fixed_link(port_np);
1892-
if (ret)
1893-
return dev_err_probe(dev, ret,
1895+
if (ret) {
1896+
ret = dev_err_probe(dev, ret,
18941897
"failed to register fixed-link phy %pOF\n",
18951898
port_np);
1899+
goto of_node_put;
1900+
}
18961901
port->slave.phy_node = of_node_get(port_np);
18971902
} else {
18981903
port->slave.phy_node =
@@ -1902,14 +1907,15 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
19021907
if (!port->slave.phy_node) {
19031908
dev_err(dev,
19041909
"slave[%d] no phy found\n", port_id);
1905-
return -ENODEV;
1910+
ret = -ENODEV;
1911+
goto of_node_put;
19061912
}
19071913

19081914
ret = of_get_phy_mode(port_np, &port->slave.phy_if);
19091915
if (ret) {
19101916
dev_err(dev, "%pOF read phy-mode err %d\n",
19111917
port_np, ret);
1912-
return ret;
1918+
goto of_node_put;
19131919
}
19141920

19151921
ret = of_get_mac_address(port_np, port->slave.mac_addr);
@@ -1932,6 +1938,11 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
19321938
}
19331939

19341940
return 0;
1941+
1942+
of_node_put:
1943+
of_node_put(port_np);
1944+
of_node_put(node);
1945+
return ret;
19351946
}
19361947

19371948
static void am65_cpsw_pcpu_stats_free(void *data)

0 commit comments

Comments
 (0)