summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorkernel test robot <lkp@intel.com>2020-11-16 16:34:44 +0100
committerJakub Kicinski <kuba@kernel.org>2020-11-17 18:27:39 +0100
commitb618c327024997589051ea3605b38d1f7ce138a7 (patch)
treee74d8e912565d64f09e0d2a5e789901ac91171d4 /drivers/net/phy
parentMerge branch 'net-dsa-tag_dsa-unify-regular-and-ethertype-dsa-taggers' (diff)
downloadlinux-b618c327024997589051ea3605b38d1f7ce138a7.tar.xz
linux-b618c327024997589051ea3605b38d1f7ce138a7.zip
net: phy: mscc: fix excluded_middle.cocci warnings
Condition !A || A && B is equivalent to !A || B. Generated by: scripts/coccinelle/misc/excluded_middle.cocci Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: kernel test robot <lkp@intel.com> Signed-off-by: Julia Lawall <julia.lawall@inria.fr> Reviewed-by: Antoine Tenart <atenart@kernel.org> Link: https://lore.kernel.org/r/alpine.DEB.2.22.394.2011161633240.2682@hadrien Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/mscc/mscc_ptp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/mscc/mscc_ptp.c b/drivers/net/phy/mscc/mscc_ptp.c
index f0537299c441..d8a61456d1ce 100644
--- a/drivers/net/phy/mscc/mscc_ptp.c
+++ b/drivers/net/phy/mscc/mscc_ptp.c
@@ -136,7 +136,7 @@ static void vsc85xx_ts_write_csr(struct phy_device *phydev, enum ts_blk blk,
phy_ts_base_write(phydev, MSCC_EXT_PAGE_ACCESS, MSCC_PHY_PAGE_1588);
- if (!cond || (cond && upper))
+ if (!cond || upper)
phy_ts_base_write(phydev, MSCC_PHY_TS_CSR_DATA_MSB, upper);
phy_ts_base_write(phydev, MSCC_PHY_TS_CSR_DATA_LSB, lower);