Skip to content

Commit 702e3fa

Browse files
author
Paolo Abeni
committed
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: Paolo Abeni <pabeni@redhat.com>
2 parents 35b862e + 39b0a10 commit 702e3fa

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4129,9 +4129,6 @@ static int stmmac_release(struct net_device *dev)
41294129
/* Release and free the Rx/Tx resources */
41304130
free_dma_desc_resources(priv, &priv->dma_conf);
41314131

4132-
/* Disable the MAC Rx/Tx */
4133-
stmmac_mac_set(priv, priv->ioaddr, false);
4134-
41354132
/* Powerdown Serdes if there is */
41364133
if (priv->plat->serdes_powerdown)
41374134
priv->plat->serdes_powerdown(dev, priv->plat->bsp_priv);
@@ -7768,8 +7765,6 @@ void stmmac_dvr_remove(struct device *dev)
77687765

77697766
pm_runtime_get_sync(dev);
77707767

7771-
stmmac_stop_all_dma(priv);
7772-
stmmac_mac_set(priv, priv->ioaddr, false);
77737768
unregister_netdev(ndev);
77747769

77757770
#ifdef CONFIG_DEBUG_FS

0 commit comments

Comments
 (0)