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

net: dsa: b53: remove eee_enabled/eee_active in b53_get_mac_eee() 



b53_get_mac_eee() sets both eee_enabled and eee_active, and then
returns zero.

dsa_slave_get_eee(), which calls this function, will then continue to
call phylink_ethtool_get_eee(), which will return -EOPNOTSUPP if there
is no PHY present, otherwise calling 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.

Thus, when there is no PHY, dsa_slave_get_eee() will fail with
-EOPNOTSUPP, meaning eee_enabled and eee_active will not be returned to
userspace. When there is a PHY, eee_enabled and eee_active will be
overwritten by phylib, making the setting of these members in
b53_get_mac_eee() entirely unnecessary.

Remove this code, thus simplifying b53_get_mac_eee().

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>
Reviewed-by: default avatarVladimir Oltean <olteanv@gmail.com>
Link: https://lore.kernel.org/r/E1rWbNI-002cCz-4x@rmk-PC.armlinux.org.uk


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

drivers/net/dsa/b53/b53_common.c

+0 −6
Original line number Diff line number Diff line
@@ -2227,16 +2227,10 @@ EXPORT_SYMBOL(b53_eee_init); 
int b53_get_mac_eee(struct dsa_switch *ds, int port, struct ethtool_keee *e)

{

	struct b53_device *dev = ds->priv;

	struct ethtool_keee *p = &dev->ports[port].eee;

	u16 reg;



	if (is5325(dev) || is5365(dev))

		return -EOPNOTSUPP;



	b53_read16(dev, B53_EEE_PAGE, B53_EEE_LPI_INDICATE, &reg);

	e->eee_enabled = p->eee_enabled;

	e->eee_active = !!(reg & BIT(port));



	return 0;

}

EXPORT_SYMBOL(b53_get_mac_eee);