| Message ID | E1tJ9J7-006LIn-Jr@rmk-PC.armlinux.org.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 92f7acb825ec272261a2057e0f9e0b1c76198dae |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phylib EEE cleanups | expand |
On Thu, Dec 05, 2024 at 10:42:05AM +0000, Russell King (Oracle) wrote: > genphy_c45_ethtool_get_eee() is only called from phy_ethtool_get_eee(), > which then calls eeecfg_to_eee(). eeecfg_to_eee() will overwrite > keee.eee_enabled, so there's no point setting keee.eee_enabled in > genphy_c45_ethtool_get_eee(). Remove this assignment. > > Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> I seem to have missed adding Heiner's r-b given in the RFC posting: Reviewed-by: Heiner Kallweit <hkallweit1@gmail.com>
diff --git a/drivers/net/phy/phy-c45.c b/drivers/net/phy/phy-c45.c index 944ae98ad110..d162f78bc68d 100644 --- a/drivers/net/phy/phy-c45.c +++ b/drivers/net/phy/phy-c45.c @@ -1521,15 +1521,13 @@ EXPORT_SYMBOL(genphy_c45_eee_is_active); int genphy_c45_ethtool_get_eee(struct phy_device *phydev, struct ethtool_keee *data) { - bool is_enabled; int ret; ret = genphy_c45_eee_is_active(phydev, data->advertised, - data->lp_advertised, &is_enabled); + data->lp_advertised, NULL); if (ret < 0) return ret; - data->eee_enabled = is_enabled; data->eee_active = phydev->eee_active; linkmode_copy(data->supported, phydev->supported_eee);
genphy_c45_ethtool_get_eee() is only called from phy_ethtool_get_eee(), which then calls eeecfg_to_eee(). eeecfg_to_eee() will overwrite keee.eee_enabled, so there's no point setting keee.eee_enabled in genphy_c45_ethtool_get_eee(). Remove this assignment. Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> --- drivers/net/phy/phy-c45.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)