Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ethernet: remove superfluous clearing of phydev

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>

authored by

Wolfram Sang and committed by
Jakub Kicinski
22f5c234 aab3c0a2

+2 -10
-1
drivers/net/ethernet/engleder/tsnep_main.c
··· 246 246 { 247 247 phy_stop(adapter->netdev->phydev); 248 248 phy_disconnect(adapter->netdev->phydev); 249 - adapter->netdev->phydev = NULL; 250 249 } 251 250 252 251 static void tsnep_tx_ring_cleanup(struct tsnep_tx *tx)
-1
drivers/net/ethernet/microchip/lan743x_main.c
··· 1466 1466 1467 1467 phy_stop(netdev->phydev); 1468 1468 phy_disconnect(netdev->phydev); 1469 - netdev->phydev = NULL; 1470 1469 } 1471 1470 1472 1471 static void lan743x_phy_interface_select(struct lan743x_adapter *adapter)
+1 -3
drivers/net/ethernet/renesas/rswitch.c
··· 1324 1324 1325 1325 static void rswitch_phy_device_deinit(struct rswitch_device *rdev) 1326 1326 { 1327 - if (rdev->ndev->phydev) { 1327 + if (rdev->ndev->phydev) 1328 1328 phy_disconnect(rdev->ndev->phydev); 1329 - rdev->ndev->phydev = NULL; 1330 - } 1331 1329 } 1332 1330 1333 1331 static int rswitch_serdes_set_params(struct rswitch_device *rdev)
-2
drivers/net/ethernet/smsc/smsc911x.c
··· 1741 1741 free_irq(dev->irq, dev); 1742 1742 mii_free_out: 1743 1743 phy_disconnect(dev->phydev); 1744 - dev->phydev = NULL; 1745 1744 out: 1746 1745 pm_runtime_put(dev->dev.parent); 1747 1746 return retval; ··· 1771 1772 if (dev->phydev) { 1772 1773 phy_stop(dev->phydev); 1773 1774 phy_disconnect(dev->phydev); 1774 - dev->phydev = NULL; 1775 1775 } 1776 1776 netif_carrier_off(dev); 1777 1777 pm_runtime_put(dev->dev.parent);
+1 -3
drivers/net/ethernet/sunplus/spl2sw_phy.c
··· 84 84 for (i = 0; i < MAX_NETDEV_NUM; i++) 85 85 if (comm->ndev[i]) { 86 86 ndev = comm->ndev[i]; 87 - if (ndev) { 87 + if (ndev) 88 88 phy_disconnect(ndev->phydev); 89 - ndev->phydev = NULL; 90 - } 91 89 } 92 90 }