| Message ID | E1qlTQS-008BWe-Va@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | d5a590b1b614d99a147cb3ec71954d96ef1a0834 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dsa: mt753x: remove mt753x_phylink_pcs_link_up() | expand |
On Wed, Sep 27, 2023 at 01:13:56PM +0100, Russell King (Oracle) wrote: > 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>
On 9/27/23 05:13, Russell King (Oracle) wrote: > 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: Florian Fainelli <florian.fainelli@broadcom.com>
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 27 Sep 2023 13:13:56 +0100 you wrote: > 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. > > [...] Here is the summary with links: - [net-next] net: dsa: mt753x: remove mt753x_phylink_pcs_link_up() https://git.kernel.org/netdev/net-next/c/d5a590b1b614 You are awesome, thank you!
diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index 035a34b50f31..0d62c69dfbb6 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -2824,15 +2824,6 @@ static void mt753x_phylink_mac_link_down(struct dsa_switch *ds, int port, 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, @@ -2921,8 +2912,6 @@ mt7531_cpu_port_config(struct dsa_switch *ds, int port) 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);
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> --- drivers/net/dsa/mt7530.c | 11 ----------- 1 file changed, 11 deletions(-)