]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
net: stmmac: remove unnecessary EEE handling in stmmac_release()
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Wed, 8 Jan 2025 16:48:50 +0000 (16:48 +0000)
committerJakub Kicinski <kuba@kernel.org>
Sat, 11 Jan 2025 01:51:02 +0000 (17:51 -0800)
phylink_stop() will cause phylink to call the mac_link_down() operation
before phylink_stop() returns. As mac_link_down() will call
stmmac_eee_init(false), this will set both priv->eee_active and
priv->eee_enabled to be false, deleting the eee_ctrl_timer if
priv->eee_enabled was previously set.

As stmmac_release() calls phylink_stop() before checking whether
priv->eee_enabled is true, this is a condition that can never be
satisfied, and thus the code within this if() block will never be
executed. Remove it.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Tested-by: Choong Yong Liang <yong.liang.choong@linux.intel.com>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tVZEg-0002LE-HH@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index 9564913726f432dfededa081b8d55c8976a77233..bac73f4db39a8144548e9503420eb14516009c5f 100644 (file)
@@ -4041,11 +4041,6 @@ static int stmmac_release(struct net_device *dev)
        /* Free the IRQ lines */
        stmmac_free_irq(dev, REQ_IRQ_ERR_ALL, 0);
 
-       if (priv->eee_enabled) {
-               priv->tx_path_in_lpi_mode = false;
-               del_timer_sync(&priv->eee_ctrl_timer);
-       }
-
        /* Stop TX/RX DMA and clear the descriptors */
        stmmac_stop_all_dma(priv);