Re: [PATCH net-next v2 2/2] net: dsa: Remove adjust_link paths

From: Simon Horman
Date: Mon Apr 29 2024 - 16:02:21 EST


On Mon, Apr 29, 2024 at 09:54:05AM -0700, Florian Fainelli wrote:
> Now that we no longer any drivers using PHYLIB's adjust_link callback,
> remove all paths that made use of adjust_link as well as the associated
> functions.
>
> Signed-off-by: Florian Fainelli <florian.fainelli@xxxxxxxxxxxx>

..

> @@ -1616,17 +1597,13 @@ static void dsa_port_phylink_mac_link_down(struct phylink_config *config,
> phy_interface_t interface)
> {
> struct dsa_port *dp = dsa_phylink_to_port(config);
> - struct phy_device *phydev = NULL;

Hi Florian,

I'm wondering if some changes got lost somewhere.

phydev is removed here...

> struct dsa_switch *ds = dp->ds;
>
> if (dsa_port_is_user(dp))
> phydev = dp->user->phydev;

.. assigned here, but not used.

Perhaps the three lines above should be removed?

>
> - if (!ds->ops->phylink_mac_link_down) {
> - if (ds->ops->adjust_link && phydev)
> - ds->ops->adjust_link(ds, dp->index, phydev);
> + if (!ds->ops->phylink_mac_link_down)
> return;
> - }
>
> ds->ops->phylink_mac_link_down(ds, dp->index, mode, interface);
> }

..

--
pw-client: changes-requested