Commit a7f6eb19 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'remove-some-unused-phylink-legacy' 

Russell King says:

====================
Remove some unused phylink legacy

I believe we are now in a position where some of the legacy phylink code
can be removed!

I believe that all DSA drivers do not make use of any pre-March 2020
phylink behaviour - all drivers now seem to set legacy_pre_march2020 to
false, and the conditions that DSA sets it to true are no longer
satisifed by any driver.

Moreover, no one uses the .mac_an_restart() method, so this can also be
removed.
====================

Link: https://lore.kernel.org/r/ZLERQ2OBrv44Ppyc@shell.armlinux.org.uk


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 2cee73ce 76226787

drivers/net/dsa/b53/b53_common.c

+0 −6
Original line number Diff line number Diff line
@@ -1393,12 +1393,6 @@ static void b53_phylink_get_caps(struct dsa_switch *ds, int port, 
	/* Get the implementation specific capabilities */

	if (dev->ops->phylink_get_caps)

		dev->ops->phylink_get_caps(dev, port, config);



	/* This driver does not make use of the speed, duplex, pause or the

	 * advertisement in its mac_config, so it is safe to mark this driver

	 * as non-legacy.

	 */

	config->legacy_pre_march2020 = false;

}



static struct phylink_pcs *b53_phylink_mac_select_pcs(struct dsa_switch *ds,

drivers/net/dsa/lan9303-core.c

+0 −6
Original line number Diff line number Diff line
@@ -1290,12 +1290,6 @@ static void lan9303_phylink_get_caps(struct dsa_switch *ds, int port, 
		__set_bit(PHY_INTERFACE_MODE_GMII,

			  config->supported_interfaces);

	}



	/* This driver does not make use of the speed, duplex, pause or the

	 * advertisement in its mac_config, so it is safe to mark this driver

	 * as non-legacy.

	 */

	config->legacy_pre_march2020 = false;

}



static void lan9303_phylink_mac_link_up(struct dsa_switch *ds, int port,

drivers/net/dsa/microchip/ksz_common.c

+0 −2
Original line number Diff line number Diff line
@@ -1624,8 +1624,6 @@ static void ksz_phylink_get_caps(struct dsa_switch *ds, int port, 
{

	struct ksz_device *dev = ds->priv;



	config->legacy_pre_march2020 = false;



	if (dev->info->supports_mii[port])

		__set_bit(PHY_INTERFACE_MODE_MII, config->supported_interfaces);

drivers/net/dsa/mt7530.c

+0 −6
Original line number Diff line number Diff line
@@ -2949,12 +2949,6 @@ static void mt753x_phylink_get_caps(struct dsa_switch *ds, int port, 
	config->mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |

				   MAC_10 | MAC_100 | MAC_1000FD;



	/* This driver does not make use of the speed, duplex, pause or the

	 * advertisement in its mac_config, so it is safe to mark this driver

	 * as non-legacy.

	 */

	config->legacy_pre_march2020 = false;



	priv->info->mac_port_get_caps(ds, port, config);

}

drivers/net/dsa/mv88e6xxx/chip.c

+0 −4
Original line number Diff line number Diff line
@@ -769,10 +769,6 @@ static void mv88e6xxx_get_caps(struct dsa_switch *ds, int port, 
		__set_bit(PHY_INTERFACE_MODE_GMII,

			  config->supported_interfaces);

	}



	/* If we have a .pcs_init, we are not legacy. */

	if (chip->info->ops->pcs_ops)

		config->legacy_pre_march2020 = false;

}



static struct phylink_pcs *mv88e6xxx_mac_select_pcs(struct dsa_switch *ds,