OSDN Git Service

net: ethernet: ti: add missing of_node_put before return
authorWang Qing <wangqing@vivo.com>
Mon, 13 Dec 2021 09:44:36 +0000 (01:44 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Dec 2021 14:54:54 +0000 (14:54 +0000)
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>
drivers/net/ethernet/ti/am65-cpsw-nuss.c

index c092cb6..ffbbda8 100644 (file)
@@ -1844,13 +1844,14 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
                if (ret < 0) {
                        dev_err(dev, "%pOF error reading port_id %d\n",
                                port_np, ret);
-                       return ret;
+                       goto of_node_put;
                }
 
                if (!port_id || port_id > common->port_num) {
                        dev_err(dev, "%pOF has invalid port_id %u %s\n",
                                port_np, port_id, port_np->name);
-                       return -EINVAL;
+                       ret = -EINVAL;
+                       goto of_node_put;
                }
 
                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)
                                (AM65_CPSW_NU_FRAM_PORT_OFFSET * (port_id - 1));
 
                port->slave.mac_sl = cpsw_sl_get("am65", dev, port->port_base);
-               if (IS_ERR(port->slave.mac_sl))
-                       return PTR_ERR(port->slave.mac_sl);
+               if (IS_ERR(port->slave.mac_sl)) {
+                       ret = PTR_ERR(port->slave.mac_sl);
+                       goto of_node_put;
+               }
 
                port->disabled = !of_device_is_available(port_np);
                if (port->disabled) {
@@ -1880,7 +1883,7 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
                        ret = PTR_ERR(port->slave.ifphy);
                        dev_err(dev, "%pOF error retrieving port phy: %d\n",
                                port_np, ret);
-                       return ret;
+                       goto of_node_put;
                }
 
                port->slave.mac_only =
@@ -1889,10 +1892,12 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
                /* get phy/link info */
                if (of_phy_is_fixed_link(port_np)) {
                        ret = of_phy_register_fixed_link(port_np);
-                       if (ret)
-                               return dev_err_probe(dev, ret,
+                       if (ret) {
+                               ret = dev_err_probe(dev, ret,
                                                     "failed to register fixed-link phy %pOF\n",
                                                     port_np);
+                               goto of_node_put;
+                       }
                        port->slave.phy_node = of_node_get(port_np);
                } else {
                        port->slave.phy_node =
@@ -1902,14 +1907,15 @@ static int am65_cpsw_nuss_init_slave_ports(struct am65_cpsw_common *common)
                if (!port->slave.phy_node) {
                        dev_err(dev,
                                "slave[%d] no phy found\n", port_id);
-                       return -ENODEV;
+                       ret = -ENODEV;
+                       goto of_node_put;
                }
 
                ret = of_get_phy_mode(port_np, &port->slave.phy_if);
                if (ret) {
                        dev_err(dev, "%pOF read phy-mode err %d\n",
                                port_np, ret);
-                       return ret;
+                       goto of_node_put;
                }
 
                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)
        }
 
        return 0;
+
+of_node_put:
+       of_node_put(port_np);
+       of_node_put(node);
+       return ret;
 }
 
 static void am65_cpsw_pcpu_stats_free(void *data)