Commit 4abd5768 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: stmmac: remove priv->dma_cap.eee test in tx_lpi methods 



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: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tffdN-003ZHt-Mq@rmk-PC.armlinux.org.uk


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

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

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