| Message ID | 6d8274ac-4344-23b4-d9a3-cad4c39517d4@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0194b64578e905dc8f112e641a71c306bd58ddde |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: phy: improve phy_read_poll_timeout | expand |
On Mon, Mar 06, 2023 at 10:51:35PM +0100, Heiner Kallweit wrote: > cond sometimes is (val & MASK) what may result in a false positive > if val is a negative errno. We shouldn't evaluate cond if val < 0. > This has no functional impact here, but it's not nice. > Therefore switch order of the checks. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Mon, Mar 06, 2023 at 10:51:35PM +0100, Heiner Kallweit wrote: > cond sometimes is (val & MASK) what may result in a false positive > if val is a negative errno. We shouldn't evaluate cond if val < 0. > This has no functional impact here, but it's not nice. > Therefore switch order of the checks. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Mon, 6 Mar 2023 22:51:35 +0100 you wrote: > cond sometimes is (val & MASK) what may result in a false positive > if val is a negative errno. We shouldn't evaluate cond if val < 0. > This has no functional impact here, but it's not nice. > Therefore switch order of the checks. > > Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> > > [...] Here is the summary with links: - [net-next] net: phy: improve phy_read_poll_timeout https://git.kernel.org/netdev/net-next/c/0194b64578e9 You are awesome, thank you!
diff --git a/include/linux/phy.h b/include/linux/phy.h index 36bf0bbc8..fefd5091b 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -1130,16 +1130,15 @@ static inline int phy_read(struct phy_device *phydev, u32 regnum) #define phy_read_poll_timeout(phydev, regnum, val, cond, sleep_us, \ timeout_us, sleep_before_read) \ ({ \ - int __ret = read_poll_timeout(phy_read, val, (cond) || val < 0, \ + int __ret = read_poll_timeout(phy_read, val, val < 0 || (cond), \ sleep_us, timeout_us, sleep_before_read, phydev, regnum); \ - if (val < 0) \ + if (val < 0) \ __ret = val; \ if (__ret) \ phydev_err(phydev, "%s failed: %d\n", __func__, __ret); \ __ret; \ }) - /** * __phy_read - convenience function for reading a given PHY register * @phydev: the phy_device struct
cond sometimes is (val & MASK) what may result in a false positive if val is a negative errno. We shouldn't evaluate cond if val < 0. This has no functional impact here, but it's not nice. Therefore switch order of the checks. Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> --- include/linux/phy.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)