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>

diff --git a/drivers/net/ethernet/engleder/tsnep_main.c b/drivers/net/ethernet/engleder/tsnep_main.c
index 6982aaa928b5b4dcfe39abfae21eeb60b8a6ec8d..ed1b6102cfeb050b80ede37c3a43143db346607b 100644 (file)
--- a/drivers/net/ethernet/engleder/tsnep_main.c
+++ b/drivers/net/ethernet/engleder/tsnep_main.c
@@ -246,7 +246,6 @@ static void tsnep_phy_close(struct tsnep_adapter *adapter)
 {
        phy_stop(adapter->netdev->phydev);
        phy_disconnect(adapter->netdev->phydev);
-       adapter->netdev->phydev = NULL;
 }
 
 static void tsnep_tx_ring_cleanup(struct tsnep_tx *tx)

diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c
index 7e0871b631e4fcb792cfc74b08c2fd1df2946e41..957d96a91a8af749dd4f81d112f633c3fbab867c 100644 (file)
--- a/drivers/net/ethernet/microchip/lan743x_main.c
+++ b/drivers/net/ethernet/microchip/lan743x_main.c
@@ -1466,7 +1466,6 @@ static void lan743x_phy_close(struct lan743x_adapter *adapter)
 
        phy_stop(netdev->phydev);
        phy_disconnect(netdev->phydev);
-       netdev->phydev = NULL;
 }
 
 static void lan743x_phy_interface_select(struct lan743x_adapter *adapter)

diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c
index c4f93d24c6a4231589ed390dcaf862fb22314eba..29afaddb598db4b32acebdfa34667365ab503c85 100644 (file)
--- a/drivers/net/ethernet/renesas/rswitch.c
+++ b/drivers/net/ethernet/renesas/rswitch.c
@@ -1324,10 +1324,8 @@ out:
 
 static void rswitch_phy_device_deinit(struct rswitch_device *rdev)
 {
-       if (rdev->ndev->phydev) {
+       if (rdev->ndev->phydev)
                phy_disconnect(rdev->ndev->phydev);
-               rdev->ndev->phydev = NULL;
-       }
 }
 
 static int rswitch_serdes_set_params(struct rswitch_device *rdev)

diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c
index a2e511912e6a9f0d1476170f4adbfff5b6a9a07d..39446d4e94b633c579c31d49b99bcb22eff7aabb 100644 (file)
--- a/drivers/net/ethernet/smsc/smsc911x.c
+++ b/drivers/net/ethernet/smsc/smsc911x.c
@@ -1741,7 +1741,6 @@ irq_stop_out:
        free_irq(dev->irq, dev);
 mii_free_out:
        phy_disconnect(dev->phydev);
-       dev->phydev = NULL;
 out:
        pm_runtime_put(dev->dev.parent);
        return retval;
@@ -1772,7 +1771,6 @@ static int smsc911x_stop(struct net_device *dev)
        if (dev->phydev) {
                phy_stop(dev->phydev);
                phy_disconnect(dev->phydev);
-               dev->phydev = NULL;
        }
        netif_carrier_off(dev);
        pm_runtime_put(dev->dev.parent);

diff --git a/drivers/net/ethernet/sunplus/spl2sw_phy.c b/drivers/net/ethernet/sunplus/spl2sw_phy.c
index 404f508a54d4590806e7cd486bf5a98700dc4aca..6f899e48f51dfbea01d7238af3c5c890c73a0590 100644 (file)
--- a/drivers/net/ethernet/sunplus/spl2sw_phy.c
+++ b/drivers/net/ethernet/sunplus/spl2sw_phy.c
@@ -84,9 +84,7 @@ void spl2sw_phy_remove(struct spl2sw_common *comm)
        for (i = 0; i < MAX_NETDEV_NUM; i++)
                if (comm->ndev[i]) {
                        ndev = comm->ndev[i];
-                       if (ndev) {
+                       if (ndev)
                                phy_disconnect(ndev->phydev);
-                               ndev->phydev = NULL;
-                       }
                }
 }