Commit e31a6f90 authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller

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().
Signed-off-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ba607808
...@@ -679,7 +679,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy) ...@@ -679,7 +679,6 @@ static int phylink_bringup_phy(struct phylink *pl, struct phy_device *phy)
mutex_lock(&phy->lock); mutex_lock(&phy->lock);
mutex_lock(&pl->state_mutex); mutex_lock(&pl->state_mutex);
pl->netdev->phydev = phy;
pl->phydev = phy; pl->phydev = phy;
linkmode_copy(pl->supported, supported); linkmode_copy(pl->supported, supported);
linkmode_copy(pl->link_config.advertising, config.advertising); linkmode_copy(pl->link_config.advertising, config.advertising);
...@@ -817,7 +816,6 @@ void phylink_disconnect_phy(struct phylink *pl) ...@@ -817,7 +816,6 @@ void phylink_disconnect_phy(struct phylink *pl)
if (phy) { if (phy) {
mutex_lock(&phy->lock); mutex_lock(&phy->lock);
mutex_lock(&pl->state_mutex); mutex_lock(&pl->state_mutex);
pl->netdev->phydev = NULL;
pl->phydev = NULL; pl->phydev = NULL;
mutex_unlock(&pl->state_mutex); mutex_unlock(&pl->state_mutex);
mutex_unlock(&phy->lock); mutex_unlock(&phy->lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment