52 lines
2.0 KiB
Diff
52 lines
2.0 KiB
Diff
From d22c85764665af931c5c61bbe282b4116a88e792 Mon Sep 17 00:00:00 2001
|
|
From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
|
|
Date: Wed, 27 Sep 2023 13:13:56 +0100
|
|
Subject: [PATCH 02/30] net: dsa: mt753x: remove mt753x_phylink_pcs_link_up()
|
|
|
|
Remove the mt753x_phylink_pcs_link_up() function for two reasons:
|
|
|
|
1) priv->pcs[i].pcs.neg_mode is set true, meaning it doesn't take a
|
|
MLO_AN_FIXED anymore, but one of PHYLINK_PCS_NEG_*. However, this
|
|
is inconsequential due to...
|
|
2) priv->pcs[port].pcs.ops is always initialised to point at
|
|
mt7530_pcs_ops, which does not have a pcs_link_up() member.
|
|
|
|
So, let's remove mt753x_phylink_pcs_link_up() entirely.
|
|
|
|
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
|
|
Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
|
|
Link: https://lore.kernel.org/r/E1qlTQS-008BWe-Va@rmk-PC.armlinux.org.uk
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/dsa/mt7530.c | 11 -----------
|
|
1 file changed, 11 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -2860,15 +2860,6 @@ static void mt753x_phylink_mac_link_down
|
|
mt7530_clear(priv, MT7530_PMCR_P(port), PMCR_LINK_SETTINGS_MASK);
|
|
}
|
|
|
|
-static void mt753x_phylink_pcs_link_up(struct phylink_pcs *pcs,
|
|
- unsigned int mode,
|
|
- phy_interface_t interface,
|
|
- int speed, int duplex)
|
|
-{
|
|
- if (pcs->ops->pcs_link_up)
|
|
- pcs->ops->pcs_link_up(pcs, mode, interface, speed, duplex);
|
|
-}
|
|
-
|
|
static void mt753x_phylink_mac_link_up(struct dsa_switch *ds, int port,
|
|
unsigned int mode,
|
|
phy_interface_t interface,
|
|
@@ -2956,8 +2947,6 @@ mt7531_cpu_port_config(struct dsa_switch
|
|
return ret;
|
|
mt7530_write(priv, MT7530_PMCR_P(port),
|
|
PMCR_CPU_PORT_SETTING(priv->id));
|
|
- mt753x_phylink_pcs_link_up(&priv->pcs[port].pcs, MLO_AN_FIXED,
|
|
- interface, speed, DUPLEX_FULL);
|
|
mt753x_phylink_mac_link_up(ds, port, MLO_AN_FIXED, interface, NULL,
|
|
speed, DUPLEX_FULL, true, true);
|
|
|