aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/net
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2024-03-07 22:16:12 +0100
committerJakub Kicinski <kuba@kernel.org>2024-03-11 13:46:27 -0700
commitc786459fc827216447b34d716d0a9f8f6a79bf73 (patch)
tree6dfe584aaf565b0700ec7853ed3c753ec7d0a8f4 /drivers/net
parentnet: phy: marvell-88x2222: Remove unused of_gpio.h (diff)
downloadwireguard-linux-c786459fc827216447b34d716d0a9f8f6a79bf73.tar.xz
wireguard-linux-c786459fc827216447b34d716d0a9f8f6a79bf73.zip
net: phy: simplify a check in phy_check_link_status
Handling case err == 0 in the other branch allows to simplify the code. In addition I assume in "err & phydev->eee_cfg.tx_lpi_enabled" it should have been a logical and operator. It works as expected also with the bitwise and, but using a bitwise and with a bool value looks ugly to me. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Link: https://lore.kernel.org/r/de37bf30-61dd-49f9-b645-2d8ea11ddb5d@gmail.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/phy/phy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index c3a0a5ee5f11..c4236564c1cd 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -985,10 +985,10 @@ static int phy_check_link_status(struct phy_device *phydev)
phydev->state = PHY_RUNNING;
err = genphy_c45_eee_is_active(phydev,
NULL, NULL, NULL);
- if (err < 0)
+ if (err <= 0)
phydev->enable_tx_lpi = false;
else
- phydev->enable_tx_lpi = (err & phydev->eee_cfg.tx_lpi_enabled);
+ phydev->enable_tx_lpi = phydev->eee_cfg.tx_lpi_enabled;
phy_link_up(phydev);
} else if (!phydev->link && phydev->state != PHY_NOLINK) {