Skip to content

Commit de38503

Browse files
Russell King (Oracle)kuba-moo
authored andcommitted
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: Russell King (Oracle) <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent bf1b8e0 commit de38503

File tree

21 files changed

+5
-51
lines changed

21 files changed

+5
-51
lines changed

drivers/net/dsa/b53/b53_serdes.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ int b53_serdes_init(struct b53_device *dev, int port)
239239
pcs->dev = dev;
240240
pcs->lane = lane;
241241
pcs->pcs.ops = &b53_pcs_ops;
242-
pcs->pcs.neg_mode = true;
243242

244243
return 0;
245244
}

drivers/net/dsa/mt7530.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3104,7 +3104,6 @@ mt753x_setup(struct dsa_switch *ds)
31043104
/* Initialise the PCS devices */
31053105
for (i = 0; i < priv->ds->num_ports; i++) {
31063106
priv->pcs[i].pcs.ops = priv->info->pcs_ops;
3107-
priv->pcs[i].pcs.neg_mode = true;
31083107
priv->pcs[i].priv = priv;
31093108
priv->pcs[i].port = i;
31103109
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ static int mv88e6185_pcs_init(struct mv88e6xxx_chip *chip, int port)
138138
mpcs->chip = chip;
139139
mpcs->port = port;
140140
mpcs->phylink_pcs.ops = &mv88e6185_phylink_pcs_ops;
141-
mpcs->phylink_pcs.neg_mode = true;
142141

143142
irq = mv88e6xxx_serdes_irq_mapping(chip, port);
144143
if (irq) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ static struct marvell_c22_pcs *marvell_c22_pcs_alloc(struct device *dev,
275275
mpcs->mdio.bus = bus;
276276
mpcs->mdio.addr = addr;
277277
mpcs->phylink_pcs.ops = &marvell_c22_pcs_ops;
278-
mpcs->phylink_pcs.neg_mode = true;
279278

280279
return mpcs;
281280
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,7 @@ static int mv88e6390_pcs_init(struct mv88e6xxx_chip *chip, int port)
565565
return -ENOMEM;
566566

567567
mpcs->sgmii_pcs.ops = &mv88e639x_sgmii_pcs_ops;
568-
mpcs->sgmii_pcs.neg_mode = true;
569568
mpcs->xg_pcs.ops = &mv88e6390_xg_pcs_ops;
570-
mpcs->xg_pcs.neg_mode = true;
571569

572570
if (chip->info->prod_num == MV88E6XXX_PORT_SWITCH_ID_PROD_6190X ||
573571
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)
945943
return -ENOMEM;
946944

947945
mpcs->sgmii_pcs.ops = &mv88e6393x_sgmii_pcs_ops;
948-
mpcs->sgmii_pcs.neg_mode = true;
949946
mpcs->xg_pcs.ops = &mv88e6393x_xg_pcs_ops;
950-
mpcs->xg_pcs.neg_mode = true;
951947
mpcs->supports_5g = true;
952948

953949
err = mv88e6393x_erratum_4_6(mpcs);

drivers/net/dsa/qca/qca8k-8xxx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1634,7 +1634,6 @@ static void qca8k_setup_pcs(struct qca8k_priv *priv, struct qca8k_pcs *qpcs,
16341634
int port)
16351635
{
16361636
qpcs->pcs.ops = &qca8k_pcs_ops;
1637-
qpcs->pcs.neg_mode = true;
16381637

16391638
/* We don't have interrupts for link changes, so we need to poll */
16401639
qpcs->pcs.poll = true;

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,9 +853,7 @@ static int macb_mii_probe(struct net_device *dev)
853853
struct macb *bp = netdev_priv(dev);
854854

855855
bp->phylink_sgmii_pcs.ops = &macb_phylink_pcs_ops;
856-
bp->phylink_sgmii_pcs.neg_mode = true;
857856
bp->phylink_usx_pcs.ops = &macb_phylink_usx_pcs_ops;
858-
bp->phylink_usx_pcs.neg_mode = true;
859857

860858
bp->phylink_config.dev = &dev->dev;
861859
bp->phylink_config.type = PHYLINK_NETDEV;

drivers/net/ethernet/freescale/fman/fman_dtsec.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,6 @@ int dtsec_initialization(struct mac_device *mac_dev,
14461446
goto _return_fm_mac_free;
14471447
}
14481448
dtsec->pcs.ops = &dtsec_pcs_ops;
1449-
dtsec->pcs.neg_mode = true;
14501449
dtsec->pcs.poll = true;
14511450

14521451
supported = mac_dev->phylink_config.supported_interfaces;

drivers/net/ethernet/marvell/mvneta.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5557,7 +5557,6 @@ static int mvneta_probe(struct platform_device *pdev)
55575557
clk_prepare_enable(pp->clk_bus);
55585558

55595559
pp->phylink_pcs.ops = &mvneta_phylink_pcs_ops;
5560-
pp->phylink_pcs.neg_mode = true;
55615560

55625561
pp->phylink_config.dev = &dev->dev;
55635562
pp->phylink_config.type = PHYLINK_NETDEV;

drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7024,9 +7024,7 @@ static int mvpp2_port_probe(struct platform_device *pdev,
70247024
dev->dev_port = port->id;
70257025

70267026
port->pcs_gmac.ops = &mvpp2_phylink_gmac_pcs_ops;
7027-
port->pcs_gmac.neg_mode = true;
70287027
port->pcs_xlg.ops = &mvpp2_phylink_xlg_pcs_ops;
7029-
port->pcs_xlg.neg_mode = true;
70307028

70317029
if (!mvpp2_use_acpi_compat_mode(port_fwnode)) {
70327030
port->phylink_config.dev = &dev->dev;

0 commit comments

Comments
 (0)