Commit be565ec7 authored by Wang Qing's avatar Wang Qing Committed by David S. Miller
Browse files

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: default avatarWang Qing <wangqing@vivo.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 71da1aec

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

+20 −9
Original line number Diff line number Diff line
@@ -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)