Commit 22f5c234 authored by Wolfram Sang's avatar Wolfram Sang Committed by Jakub Kicinski
Browse files

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: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20230321131745.27688-1-wsa+renesas@sang-engineering.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent aab3c0a2

drivers/net/ethernet/engleder/tsnep_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/microchip/lan743x_main.c

+0 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/renesas/rswitch.c

+1 −3
Original line number Diff line number Diff line
@@ -1324,10 +1324,8 @@ static int rswitch_phy_device_init(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);

		rdev->ndev->phydev = NULL;

	}

}



static int rswitch_serdes_set_params(struct rswitch_device *rdev)

drivers/net/ethernet/smsc/smsc911x.c

+0 −2
Original line number Diff line number Diff line
@@ -1741,7 +1741,6 @@ static int smsc911x_open(struct net_device *dev) 
	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);

drivers/net/ethernet/sunplus/spl2sw_phy.c

+1 −3
Original line number Diff line number Diff line
@@ -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;

			}

		}

}