From: Russell King (Oracle) Date: Wed, 29 May 2024 13:29:45 +0000 (+0100) Subject: net: stmmac: dwmac-intel: remove checking for fixed link X-Git-Tag: v6.11-rc1~163^2~280^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ab77c7aa9388ccc82102c9e448112ab478bba80c;p=thirdparty%2Flinux.git net: stmmac: dwmac-intel: remove checking for fixed link With the new default_an_inband functionality in phylink, there is no need to check for a fixed link when this flag is set, since a fixed link will now override default_an_inband. Signed-off-by: Russell King (Oracle) Reviewed-by: Andrew Halaney Link: https://lore.kernel.org/r/E1sCJNB-00EcrJ-7L@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 5e96146b8bd93..56649edb18cd5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -589,17 +589,6 @@ static int intel_mgbe_common_data(struct pci_dev *pdev, plat->mdio_bus_data->default_an_inband = true; } - /* For fixed-link setup, we clear default_an_inband */ - if (fwnode) { - struct fwnode_handle *fixed_node; - - fixed_node = fwnode_get_named_child_node(fwnode, "fixed-link"); - if (fixed_node) - plat->mdio_bus_data->default_an_inband = false; - - fwnode_handle_put(fixed_node); - } - /* Ensure mdio bus scan skips intel serdes and pcs-xpcs */ plat->mdio_bus_data->phy_mask = 1 << INTEL_MGBE_ADHOC_ADDR; plat->mdio_bus_data->phy_mask |= 1 << INTEL_MGBE_XPCS_ADDR;