diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-06-20 23:45:10 +0100 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2022-06-21 10:57:31 +0100 |
| commit | 66ef78f041a9d9fa28b9a1d7b7e978a9d76c2445 (patch) | |
| tree | e96c23d15cb5ed8340fb6f93fa16ee391c1555c3 /net | |
| parent | f58ffdfcae6816791088043793397d0a8876eaf0 (diff) | |
net: dsa: switch to using phylink for cpu ports
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/port.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/net/dsa/port.c b/net/dsa/port.c index a2ee78c9b37f..9bdbcb6a56ea 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -1643,20 +1643,14 @@ err_phy_connect: int dsa_port_link_register_of(struct dsa_port *dp) { struct dsa_switch *ds = dp->ds; - struct device_node *phy_np; int port = dp->index; if (!ds->ops->adjust_link) { - phy_np = of_parse_phandle(dp->dn, "phy-handle", 0); - if (of_phy_is_fixed_link(dp->dn) || phy_np) { - if (ds->ops->phylink_mac_link_down) - ds->ops->phylink_mac_link_down(ds, port, - MLO_AN_FIXED, PHY_INTERFACE_MODE_NA); - of_node_put(phy_np); - return dsa_port_phylink_register(dp); - } - of_node_put(phy_np); - return 0; + if (ds->ops->phylink_mac_link_down) + ds->ops->phylink_mac_link_down(ds, port, + MLO_AN_FIXED, PHY_INTERFACE_MODE_NA); + + return dsa_port_phylink_register(dp); } dev_warn(ds->dev, |