Commit de38503b authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: remove phylink_pcs .neg_mode boolean 



As all PCS are using the neg_mode parameter rather than the legacy
an_mode, remove the ability to use the legacy an_mode. We remove the
tests in the phylink code, unconditionally passing the PCS neg_mode
parameter to PCS methods, and remove setting the flag from drivers.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tidPn-0040hd-2R@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bf1b8e0a

drivers/net/dsa/b53/b53_serdes.c

+0 −1
Original line number Diff line number Diff line
@@ -239,7 +239,6 @@ int b53_serdes_init(struct b53_device *dev, int port) 
	pcs->dev = dev;

	pcs->lane = lane;

	pcs->pcs.ops = &b53_pcs_ops;

	pcs->pcs.neg_mode = true;



	return 0;

}

drivers/net/dsa/mt7530.c

+0 −1
Original line number Diff line number Diff line
@@ -3104,7 +3104,6 @@ mt753x_setup(struct dsa_switch *ds) 
	/* Initialise the PCS devices */

	for (i = 0; i < priv->ds->num_ports; i++) {

		priv->pcs[i].pcs.ops = priv->info->pcs_ops;

		priv->pcs[i].pcs.neg_mode = true;

		priv->pcs[i].priv = priv;

		priv->pcs[i].port = i;

	}

drivers/net/dsa/mv88e6xxx/pcs-6185.c

+0 −1
Original line number Diff line number Diff line
@@ -138,7 +138,6 @@ static int mv88e6185_pcs_init(struct mv88e6xxx_chip *chip, int port) 
	mpcs->chip = chip;

	mpcs->port = port;

	mpcs->phylink_pcs.ops = &mv88e6185_phylink_pcs_ops;

	mpcs->phylink_pcs.neg_mode = true;



	irq = mv88e6xxx_serdes_irq_mapping(chip, port);

	if (irq) {

drivers/net/dsa/mv88e6xxx/pcs-6352.c

+0 −1
Original line number Diff line number Diff line
@@ -275,7 +275,6 @@ static struct marvell_c22_pcs *marvell_c22_pcs_alloc(struct device *dev, 
	mpcs->mdio.bus = bus;

	mpcs->mdio.addr = addr;

	mpcs->phylink_pcs.ops = &marvell_c22_pcs_ops;

	mpcs->phylink_pcs.neg_mode = true;



	return mpcs;

}

drivers/net/dsa/mv88e6xxx/pcs-639x.c

+0 −4
Original line number Diff line number Diff line
@@ -565,9 +565,7 @@ static int mv88e6390_pcs_init(struct mv88e6xxx_chip *chip, int port) 
		return -ENOMEM;



	mpcs->sgmii_pcs.ops = &mv88e639x_sgmii_pcs_ops;

	mpcs->sgmii_pcs.neg_mode = true;

	mpcs->xg_pcs.ops = &mv88e6390_xg_pcs_ops;

	mpcs->xg_pcs.neg_mode = true;



	if (chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6190X ||

	    chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6390X)
@@ -945,9 +943,7 @@ static int mv88e6393x_pcs_init(struct mv88e6xxx_chip *chip, int port) 
		return -ENOMEM;



	mpcs->sgmii_pcs.ops = &mv88e6393x_sgmii_pcs_ops;

	mpcs->sgmii_pcs.neg_mode = true;

	mpcs->xg_pcs.ops = &mv88e6393x_xg_pcs_ops;

	mpcs->xg_pcs.neg_mode = true;

	mpcs->supports_5g = true;



	err = mv88e6393x_erratum_4_6(mpcs);