mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-02 13:23:35 -04:00
net: hns: hisilicon: hns_dsaf_mac: switch to scoped device_for_each_child_node()
Use device_for_each_child_node_scoped() to simplify the code by removing the need for explicit calls to fwnode_handle_put() in every error path. This approach also accounts for any error path that could be added. Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com> Link: https://patch.msgid.link/20240930-net-device_for_each_child_node_scoped-v2-2-35f09333c1d7@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
committed by
Jakub Kicinski
parent
1d39d02a15
commit
e97dccd3e9
@@ -1090,28 +1090,24 @@ int hns_mac_init(struct dsaf_device *dsaf_dev)
|
||||
u32 port_id;
|
||||
int max_port_num = hns_mac_get_max_port_num(dsaf_dev);
|
||||
struct hns_mac_cb *mac_cb;
|
||||
struct fwnode_handle *child;
|
||||
|
||||
device_for_each_child_node(dsaf_dev->dev, child) {
|
||||
device_for_each_child_node_scoped(dsaf_dev->dev, child) {
|
||||
ret = fwnode_property_read_u32(child, "reg", &port_id);
|
||||
if (ret) {
|
||||
fwnode_handle_put(child);
|
||||
dev_err(dsaf_dev->dev,
|
||||
"get reg fail, ret=%d!\n", ret);
|
||||
return ret;
|
||||
}
|
||||
if (port_id >= max_port_num) {
|
||||
fwnode_handle_put(child);
|
||||
dev_err(dsaf_dev->dev,
|
||||
"reg(%u) out of range!\n", port_id);
|
||||
return -EINVAL;
|
||||
}
|
||||
mac_cb = devm_kzalloc(dsaf_dev->dev, sizeof(*mac_cb),
|
||||
GFP_KERNEL);
|
||||
if (!mac_cb) {
|
||||
fwnode_handle_put(child);
|
||||
if (!mac_cb)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
mac_cb->fw_port = child;
|
||||
mac_cb->mac_id = (u8)port_id;
|
||||
dsaf_dev->mac_cb[port_id] = mac_cb;
|
||||
|
||||
Reference in New Issue
Block a user