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

net: bcmasp: remove eee_enabled/eee_active in bcmasp_get_eee() 



bcmasp_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 bcmasp_get_eee() is redundant, and
can be removed. This also makes intf->eee.eee_active unnecessary, so
remove this and use a local variable where appropriate.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/E1rWbNC-002cCt-W7@rmk-PC.armlinux.org.uk


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

drivers/net/ethernet/broadcom/asp2/bcmasp_ethtool.c

+0 −4
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ void bcmasp_eee_enable_set(struct bcmasp_intf *intf, bool enable) 
	umac_wl(intf, reg, UMC_EEE_CTRL);



	intf->eee.eee_enabled = enable;

	intf->eee.eee_active = enable;

}



static int bcmasp_get_eee(struct net_device *dev, struct ethtool_keee *e)
@@ -371,8 +370,6 @@ static int bcmasp_get_eee(struct net_device *dev, struct ethtool_keee *e) 
	if (!dev->phydev)

		return -ENODEV;



	e->eee_enabled = p->eee_enabled;

	e->eee_active = p->eee_active;

	e->tx_lpi_enabled = p->tx_lpi_enabled;

	e->tx_lpi_timer = umac_rl(intf, UMC_EEE_LPI_TIMER);
@@ -399,7 +396,6 @@ static int bcmasp_set_eee(struct net_device *dev, struct ethtool_keee *e) 
		}



		umac_wl(intf, e->tx_lpi_timer, UMC_EEE_LPI_TIMER);

		intf->eee.eee_active = ret >= 0;

		intf->eee.tx_lpi_enabled = e->tx_lpi_enabled;

		bcmasp_eee_enable_set(intf, true);

	}

drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c

+3 −2
Original line number Diff line number Diff line
@@ -607,6 +607,7 @@ static void bcmasp_adj_link(struct net_device *dev) 
	struct phy_device *phydev = dev->phydev;

	u32 cmd_bits = 0, reg;

	int changed = 0;

	bool active;



	if (intf->old_link != phydev->link) {

		changed = 1;
@@ -658,8 +659,8 @@ static void bcmasp_adj_link(struct net_device *dev) 
		reg |= cmd_bits;

		umac_wl(intf, reg, UMC_CMD);



		intf->eee.eee_active = phy_init_eee(phydev, 0) >= 0;

		bcmasp_eee_enable_set(intf, intf->eee.eee_active);

		active = phy_init_eee(phydev, 0) >= 0;

		bcmasp_eee_enable_set(intf, active);

	}



	reg = rgmii_rl(intf, RGMII_OOB_CNTRL);