From: Arınç ÜNAL Date: Mon, 22 Jan 2024 05:35:57 +0000 (+0300) Subject: net: dsa: mt7530: do not set priv->p5_interface on mt7530_setup_port5() X-Git-Tag: v6.9-rc1~159^2~410^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6537973f2a5dc3e83a424142366fd15a2b97199f;p=thirdparty%2Fkernel%2Flinux.git net: dsa: mt7530: do not set priv->p5_interface on mt7530_setup_port5() Running mt7530_setup_port5() from mt7530_setup() used to handle all cases of configuring port 5, including phylink. Setting priv->p5_interface under mt7530_setup_port5() makes sure that mt7530_setup_port5() from mt753x_phylink_mac_config() won't run. The commit ("net: dsa: mt7530: improve code path for setting up port 5") makes so that mt7530_setup_port5() from mt7530_setup() runs only on non-phylink cases. Get rid of unnecessarily setting priv->p5_interface under mt7530_setup_port5() as port 5 phylink configuration will be done by running mt7530_setup_port5() from mt753x_phylink_mac_config() now. Signed-off-by: Arınç ÜNAL Reviewed-by: Vladimir Oltean Link: https://lore.kernel.org/r/20240122-for-netnext-mt7530-improvements-1-v3-6-042401f2b279@arinc9.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c index b44f831c4621e..07e8e5202b57e 100644 --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c @@ -978,8 +978,6 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface) dev_dbg(ds->dev, "Setup P5, HWTRAP=0x%x, intf_sel=%s, phy-mode=%s\n", val, p5_intf_modes(priv->p5_intf_sel), phy_modes(interface)); - priv->p5_interface = interface; - unlock_exit: mutex_unlock(&priv->reg_mutex); }