Commit 925f3deb authored by Clément Léger's avatar Clément Léger Committed by Jakub Kicinski

net: lan966x: add missing fwnode_handle_put() for ports node

Since the "ethernet-ports" node is retrieved using
device_get_named_child_node(), it should be release after using it. Add
missing fwnode_handle_put() and move the code that retrieved the node
from device-tree to avoid complicated handling in case of error.

Fixes: db8bcaad ("net: lan966x: add the basic lan966x driver")
Signed-off-by: default avatarClément Léger <clement.leger@bootlin.com>
Reviewed-by: default avatarAlexander Duyck <alexanderduyck@fb.com>
Link: https://lore.kernel.org/r/20230112161311.495124-1-clement.leger@bootlin.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3c463721
...@@ -1043,11 +1043,6 @@ static int lan966x_probe(struct platform_device *pdev) ...@@ -1043,11 +1043,6 @@ static int lan966x_probe(struct platform_device *pdev)
lan966x->base_mac[5] &= 0xf0; lan966x->base_mac[5] &= 0xf0;
} }
ports = device_get_named_child_node(&pdev->dev, "ethernet-ports");
if (!ports)
return dev_err_probe(&pdev->dev, -ENODEV,
"no ethernet-ports child found\n");
err = lan966x_create_targets(pdev, lan966x); err = lan966x_create_targets(pdev, lan966x);
if (err) if (err)
return dev_err_probe(&pdev->dev, err, return dev_err_probe(&pdev->dev, err,
...@@ -1125,6 +1120,11 @@ static int lan966x_probe(struct platform_device *pdev) ...@@ -1125,6 +1120,11 @@ static int lan966x_probe(struct platform_device *pdev)
} }
} }
ports = device_get_named_child_node(&pdev->dev, "ethernet-ports");
if (!ports)
return dev_err_probe(&pdev->dev, -ENODEV,
"no ethernet-ports child found\n");
/* init switch */ /* init switch */
lan966x_init(lan966x); lan966x_init(lan966x);
lan966x_stats_init(lan966x); lan966x_stats_init(lan966x);
...@@ -1162,6 +1162,8 @@ static int lan966x_probe(struct platform_device *pdev) ...@@ -1162,6 +1162,8 @@ static int lan966x_probe(struct platform_device *pdev)
goto cleanup_ports; goto cleanup_ports;
} }
fwnode_handle_put(ports);
lan966x_mdb_init(lan966x); lan966x_mdb_init(lan966x);
err = lan966x_fdb_init(lan966x); err = lan966x_fdb_init(lan966x);
if (err) if (err)
...@@ -1191,6 +1193,7 @@ static int lan966x_probe(struct platform_device *pdev) ...@@ -1191,6 +1193,7 @@ static int lan966x_probe(struct platform_device *pdev)
lan966x_fdb_deinit(lan966x); lan966x_fdb_deinit(lan966x);
cleanup_ports: cleanup_ports:
fwnode_handle_put(ports);
fwnode_handle_put(portnp); fwnode_handle_put(portnp);
lan966x_cleanup_ports(lan966x); lan966x_cleanup_ports(lan966x);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment