| Message ID | 20220630140237.692986-2-michael@walle.cc (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: lan966x: hardcode port count | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/fixes_present | success | Fixes tag not required for -next series |
| netdev/subject_prefix | success | Link |
| netdev/cover_letter | success | Series has a cover letter |
| netdev/patch_count | success | Link |
| netdev/header_inline | success | No static functions without inline keyword in header files |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/cc_maintainers | success | CCed 7 of 7 maintainers |
| netdev/build_clang | success | Errors and warnings before: 0 this patch: 0 |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Signed-off-by tag matches author and committer |
| netdev/check_selftest | success | No net selftest shell script |
| netdev/verify_fixes | success | No Fixes tag |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 50 lines checked |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/source_inline | success | Was 0 now: 0 |
diff --git a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c index 5784c4161e5e..d611b52d3a07 100644 --- a/drivers/net/ethernet/microchip/lan966x/lan966x_main.c +++ b/drivers/net/ethernet/microchip/lan966x/lan966x_main.c @@ -26,8 +26,16 @@ #define IO_RANGES 2 +struct lan966x_info { + u8 num_phys_ports; +}; + +static const struct lan966x_info lan9668_info = { + .num_phys_ports = 8, +}; + static const struct of_device_id lan966x_match[] = { - { .compatible = "microchip,lan966x-switch" }, + { .compatible = "microchip,lan966x-switch", .data = &lan9668_info }, { } }; MODULE_DEVICE_TABLE(of, lan966x_match); @@ -992,9 +1000,10 @@ static int lan966x_reset_switch(struct lan966x *lan966x) static int lan966x_probe(struct platform_device *pdev) { struct fwnode_handle *ports, *portnp; + const struct lan966x_info *info; struct lan966x *lan966x; u8 mac_addr[ETH_ALEN]; - int err, i; + int err; lan966x = devm_kzalloc(&pdev->dev, sizeof(*lan966x), GFP_KERNEL); if (!lan966x) @@ -1003,6 +1012,10 @@ static int lan966x_probe(struct platform_device *pdev) platform_set_drvdata(pdev, lan966x); lan966x->dev = &pdev->dev; + info = device_get_match_data(&pdev->dev); + if (!info) + return -ENODEV; + if (!device_get_mac_address(&pdev->dev, mac_addr)) { ether_addr_copy(lan966x->base_mac, mac_addr); } else { @@ -1025,11 +1038,7 @@ static int lan966x_probe(struct platform_device *pdev) if (err) return dev_err_probe(&pdev->dev, err, "Reset failed"); - i = 0; - fwnode_for_each_available_child_node(ports, portnp) - ++i; - - lan966x->num_phys_ports = i; + lan966x->num_phys_ports = info->num_phys_ports; lan966x->ports = devm_kcalloc(&pdev->dev, lan966x->num_phys_ports, sizeof(struct lan966x_port *), GFP_KERNEL);
Instead of counting the child nodes in the device tree, hardcode the number of ports in the driver itself. The counting won't work at all if an ethernet port is marked as disabled, eg. because it is not connected on the board at all. This is hardcoding the number of ports to eight for the generic compatible string "microchip,lan966x-switch", although it clearly only applies to the LAN9668. This is because, first, there is only one user for now, and that is the LAN9668 and second, the generic compatible string will be deprecated in favor of a more specific one. Therefore, if there will be support for the LAN9662, it can be added by another specific compatible string. Signed-off-by: Michael Walle <michael@walle.cc> --- .../ethernet/microchip/lan966x/lan966x_main.c | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-)