Commit 702e3fa1 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'net-stmmac-avoid-unnecessary-work-in-stmmac_release-stmmac_dvr_remove' 

Russell King says:

====================
net: stmmac: avoid unnecessary work in stmmac_release()/stmmac_dvr_remove()

This small series is a subset of a RFC I sent earlier. These two
patches remove code that is unnecessary and/or wrong in these paths.
Details in each commit.
====================

Link: https://patch.msgid.link/Z87bpDd7QYYVU0ML@shell.armlinux.org.uk


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 35b862ea 39b0a10d

drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

+0 −5
Original line number Diff line number Diff line
@@ -4129,9 +4129,6 @@ static int stmmac_release(struct net_device *dev) 
	/* Release and free the Rx/Tx resources */

	free_dma_desc_resources(priv, &priv->dma_conf);



	/* Disable the MAC Rx/Tx */

	stmmac_mac_set(priv, priv->ioaddr, false);



	/* Powerdown Serdes if there is */

	if (priv->plat->serdes_powerdown)

		priv->plat->serdes_powerdown(dev, priv->plat->bsp_priv);
@@ -7768,8 +7765,6 @@ void stmmac_dvr_remove(struct device *dev) 


	pm_runtime_get_sync(dev);



	stmmac_stop_all_dma(priv);

	stmmac_mac_set(priv, priv->ioaddr, false);

	unregister_netdev(ndev);



#ifdef CONFIG_DEBUG_FS