qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: phy: simplify genphy_c45_ethtool_set_eee 

JIRA: https://issues.redhat.com/browse/RHEL-57766

commit b38061fe9cfa90a781e9e59fc761191fc8b469a1
Author: Heiner Kallweit <hkallweit1@gmail.com>
Date:   Tue Feb 20 22:55:38 2024 +0100

    net: phy: simplify genphy_c45_ethtool_set_eee

    Simplify the function, no functional change intended.

    - Remove not needed variable unsupp, I think code is even better
      readable now.
    - Move setting phydev->eee_enabled out of the if clause
    - Simplify return value handling

    Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
    Link: https://lore.kernel.org/r/442277c7-7431-4542-80b5-1d3d691714d7@gmail.com
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>

Signed-off-by: Izabela Bakollari <ibakolla@redhat.com>
This commit is contained in:
Izabela Bakollari 2024-10-01 09:52:13 +02:00
parent 6d907ae356
commit 3b7057f97c
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/phy/phy-c45.c
View File

@ -1561,10 +1561,8 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
if (!linkmode_empty(adv)) {
__ETHTOOL_DECLARE_LINK_MODE_MASK(tmp);
bool unsupp;
unsupp = linkmode_andnot(tmp, adv, phydev->supported_eee);
if (unsupp) {
if (linkmode_andnot(tmp, adv, phydev->supported_eee)) {
phydev_warn(phydev, "At least some EEE link modes are not supported.\n");
return -EINVAL;
}
@ -1573,18 +1571,15 @@ int genphy_c45_ethtool_set_eee(struct phy_device *phydev,
}
linkmode_copy(phydev->advertising_eee, adv);
phydev->eee_enabled = true;
} else {
phydev->eee_enabled = false;
}
phydev->eee_enabled = data->eee_enabled;
ret = genphy_c45_an_config_eee_aneg(phydev);
if (ret < 0)
return ret;
if (ret > 0)
return phy_restart_aneg(phydev);
return 0;
return ret;
}
EXPORT_SYMBOL(genphy_c45_ethtool_set_eee);