net: phylink: Remove redundant netdev.phydev assignment
Subsystems (4)
PATCH 1/1 net: phylink: Remove redundant netdev.phydev assignment
As a part of working on MII time stamping infrastructure, I was trying to figure out how netdev->phydev gets assigned, and I stumbled across this. Ever since the new phylink code came in, the field is assigned twice.
The function, phylink_connect_phy(), calls
phy_attach_direct()
phylink_bringup_phy()
and phy_attach_direct() sets
dev->phydev = phydev;
but phylink_bringup_phy() then sets the same field again:
pl->netdev->phydev = phy;
Similarly, the function, phylink_of_phy_connect(), calls
of_phy_attach() phy_attach_direct() phylink_bringup_phy()
The removal code is also duplicated:
phylink_disconnect_phy()
pl->netdev->phydev = NULL; phy_disconnect() phy_detach() phydev->attached_dev->phydev = NULL;
This patch removes the redundant assignments, restricting manipulation of the netdev.phydev field to phy_attach_direct() and phy_detach().
--- drivers/net/phy/phylink.c | 2 -- 1 file changed, 2 deletions(-)
drivers/net/phy/phylink.c +0 -2
@@ -679,7 +679,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy)mutex_lock (&phy->lock);mutex_lock (&pl->state_mutex); - pl->netdev->phydev = phy; pl->phydev = phy;linkmode_copy (pl->supported, supported);linkmode_copy (pl->link_config.advertising, config.advertising);
@@ -817,7 +816,6 @@ void phylink_disconnect_phy(struct phylink *pl)if (phy) {mutex_lock (&phy->lock);mutex_lock (&pl->state_mutex); - pl->netdev->phydev =NULL ; pl->phydev =NULL ;mutex_unlock (&pl->state_mutex);mutex_unlock (&phy->lock);
Signature · 1 line
2.11.0
From: Richard Cochran <[email protected]>
Date: Fri, 23 Feb 2018 07:25:46 -0800
Quoted 32 lines
As a part of working on MII time stamping infrastructure, I was trying to figure out how
netdev->phydevgets assigned, and I stumbled across this. Ever since the new phylink code came in, the field is assigned twice.The function,
phylink_connect_phy(), calls
phy_attach_direct()
phylink_bringup_phy()and
phy_attach_direct()setsdev->phydev = phydev;but
phylink_bringup_phy()then sets the same field again:pl->netdev->phydev = phy;Similarly, the function,
phylink_of_phy_connect(), callsof_phy_attach() phy_attach_direct() phylink_bringup_phy()The removal code is also duplicated:
phylink_disconnect_phy()pl->netdev->phydev = NULL; phy_disconnect() phy_detach() phydev->attached_dev->phydev = NULL;
Quoted 4 lines
This patch removes the redundant assignments, restricting manipulation of the netdev.phydev field to
phy_attach_direct()andphy_detach().Signed-off-by Richard Cochran <[email protected]>
Applied, thanks Richard.