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

net: sxgbe: remove eee_enabled/eee_active in sxgbe_get_eee() 



sxgbe_get_eee() sets edata->eee_active and edata->eee_enabled from its
own copy, and then calls phy_ethtool_get_eee() which in turn will call
genphy_c45_ethtool_get_eee().

genphy_c45_ethtool_get_eee() will overwrite eee_enabled and eee_active
with its own interpretation from the PHYs settings and negotiation
result.

Therefore, setting these members in sxgbe_get_eee() is redundant.
Remove this, and remove the priv->eee_active member which then becomes
a write-only variable.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1rWbMx-002cCb-IU@rmk-PC.armlinux.org.uk


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

drivers/net/ethernet/samsung/sxgbe/sxgbe_common.h

+0 −1
Original line number Diff line number Diff line
@@ -503,7 +503,6 @@ struct sxgbe_priv_data { 
	bool tx_path_in_lpi_mode;

	int lpi_irq;

	int eee_enabled;

	int eee_active;

	int tx_lpi_timer;

};

drivers/net/ethernet/samsung/sxgbe/sxgbe_ethtool.c

+0 −2
Original line number Diff line number Diff line
@@ -140,8 +140,6 @@ static int sxgbe_get_eee(struct net_device *dev, 
	if (!priv->hw_cap.eee)

		return -EOPNOTSUPP;



	edata->eee_enabled = priv->eee_enabled;

	edata->eee_active = priv->eee_active;

	edata->tx_lpi_timer = priv->tx_lpi_timer;



	return phy_ethtool_get_eee(dev->phydev, edata);

drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c

+0 −1
Original line number Diff line number Diff line
@@ -130,7 +130,6 @@ bool sxgbe_eee_init(struct sxgbe_priv_data * const priv) 
		if (phy_init_eee(ndev->phydev, true))

			return false;



		priv->eee_active = 1;

		timer_setup(&priv->eee_ctrl_timer, sxgbe_eee_ctrl_timer, 0);

		priv->eee_ctrl_timer.expires = SXGBE_LPI_TIMER(eee_timer);

		add_timer(&priv->eee_ctrl_timer);