iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ethernet: remove superfluous clearing of phydev

Browse Source 
phy_disconnect() calls phy_detach() which already clears 'phydev' if it
is attached to a struct net_device.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230321131745.27688-1-wsa+renesas@sang-engineering.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Wolfram Sang 2023-03-21 14:17:45 +01:00 committed by Jakub Kicinski
parent aab3c0a206
commit 22f5c23414
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/ethernet/engleder/tsnep_main.c
View File

@ -246,7 +246,6 @@ static void tsnep_phy_close(struct tsnep_adapter *adapter)
{ {
phy_stop(adapter->netdev->phydev); phy_stop(adapter->netdev->phydev);
phy_disconnect(adapter->netdev->phydev); phy_disconnect(adapter->netdev->phydev);
adapter->netdev->phydev = NULL;
} }
static void tsnep_tx_ring_cleanup(struct tsnep_tx *tx) static void tsnep_tx_ring_cleanup(struct tsnep_tx *tx)

1
drivers/net/ethernet/microchip/lan743x_main.c
View File

@ -1466,7 +1466,6 @@ static void lan743x_phy_close(struct lan743x_adapter *adapter)
phy_stop(netdev->phydev); phy_stop(netdev->phydev);
phy_disconnect(netdev->phydev); phy_disconnect(netdev->phydev);
netdev->phydev = NULL;
} }
static void lan743x_phy_interface_select(struct lan743x_adapter *adapter) static void lan743x_phy_interface_select(struct lan743x_adapter *adapter)

4
drivers/net/ethernet/renesas/rswitch.c
View File

@ -1324,10 +1324,8 @@ out:
static void rswitch_phy_device_deinit(struct rswitch_device *rdev) static void rswitch_phy_device_deinit(struct rswitch_device *rdev)
{ {
if (rdev->ndev->phydev) { if (rdev->ndev->phydev)
phy_disconnect(rdev->ndev->phydev); phy_disconnect(rdev->ndev->phydev);
rdev->ndev->phydev = NULL;
}
} }
static int rswitch_serdes_set_params(struct rswitch_device *rdev) static int rswitch_serdes_set_params(struct rswitch_device *rdev)

2
drivers/net/ethernet/smsc/smsc911x.c
View File

@ -1741,7 +1741,6 @@ irq_stop_out:
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
mii_free_out: mii_free_out:
phy_disconnect(dev->phydev); phy_disconnect(dev->phydev);
dev->phydev = NULL;
out: out:
pm_runtime_put(dev->dev.parent); pm_runtime_put(dev->dev.parent);
return retval; return retval;
@ -1772,7 +1771,6 @@ static int smsc911x_stop(struct net_device *dev)
if (dev->phydev) { if (dev->phydev) {
phy_stop(dev->phydev); phy_stop(dev->phydev);
phy_disconnect(dev->phydev); phy_disconnect(dev->phydev);
dev->phydev = NULL;
} }
netif_carrier_off(dev); netif_carrier_off(dev);
pm_runtime_put(dev->dev.parent); pm_runtime_put(dev->dev.parent);

4
drivers/net/ethernet/sunplus/spl2sw_phy.c
View File

@ -84,9 +84,7 @@ void spl2sw_phy_remove(struct spl2sw_common *comm)
for (i = 0; i < MAX_NETDEV_NUM; i++) for (i = 0; i < MAX_NETDEV_NUM; i++)
if (comm->ndev[i]) { if (comm->ndev[i]) {
ndev = comm->ndev[i]; ndev = comm->ndev[i];
if (ndev) { if (ndev)
phy_disconnect(ndev->phydev); phy_disconnect(ndev->phydev);
ndev->phydev = NULL;
}
} }
} }