]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: stmmac: remove priv->dma_cap.eee test in tx_lpi methods
authorRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Wed, 5 Feb 2025 13:40:05 +0000 (13:40 +0000)
committerJakub Kicinski <kuba@kernel.org>
Fri, 7 Feb 2025 19:56:09 +0000 (11:56 -0800)
The tests for priv->dma_cap.eee in stmmac_mac_{en,dis}able_tx_lpi()
is useless as these methods will only be called when using phylink
managed EEE, and that will only be enabled if the LPI capabilities
in phylink_config have been populated during initialisation. This
only occurs when priv->dma_cap.eee was true.

As priv->dma_cap.eee remains constant during the lifetime of the driver
instance, there is no need to re-check it in these methods.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffdN-003ZHt-Mq@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c

index dfd4965404f9352f1acaa15ef85807713af5fd07..d3854e1b4d269fa43b554daf8bf5adeec93e5a4e 100644 (file)
@@ -1044,12 +1044,6 @@ static void stmmac_mac_disable_tx_lpi(struct phylink_config *config)
 
        priv->eee_active = false;
 
-       /* Check if MAC core supports the EEE feature. */
-       if (!priv->dma_cap.eee) {
-               priv->eee_enabled = false;
-               return;
-       }
-
        mutex_lock(&priv->lock);
 
        /* Check if it needs to be deactivated */
@@ -1079,12 +1073,6 @@ static int stmmac_mac_enable_tx_lpi(struct phylink_config *config, u32 timer,
        priv->tx_lpi_timer = timer;
        priv->eee_active = true;
 
-       /* Check if MAC core supports the EEE feature. */
-       if (!priv->dma_cap.eee) {
-               priv->eee_enabled = false;
-               return 0;
-       }
-
        mutex_lock(&priv->lock);
 
        if (priv->eee_active && !priv->eee_enabled) {