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) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Halaney <ahalaney@redhat.com>
Link: https://lore.kernel.org/r/E1sCJNB-00EcrJ-7L@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c
index 5e96146b8bd93774c1ce40330a2a12d787540705..56649edb18cd54c26bb0bd947c80edc10762efbc 100644 (file)
--- 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;