2020-11-16 15:37:59

by Julia Lawall

Subject: [PATCH v2] net: phy: mscc: fix excluded_middle.cocci warnings

From: kernel test robot <[email protected]>

Condition !A || A && B is equivalent to !A || B.

Generated by: scripts/coccinelle/misc/excluded_middle.cocci

Fixes: b76f0ea01312 ("coccinelle: misc: add excluded_middle.cocci script")
CC: Denis Efremov <[email protected]>
Reported-by: kernel test robot <[email protected]>
Signed-off-by: kernel test robot <[email protected]>
Signed-off-by: Julia Lawall <[email protected]>
---

v2: add netdev mailing list

tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
head: e28c0d7c92c89016c12a677616668957351e7542
commit: b76f0ea013125358d1b4ca147a6f9b6883dd2493 coccinelle: misc: add excluded_middle.cocci script
:::::: branch date: 8 hours ago
:::::: commit date: 8 weeks ago

Please take the patch only if it's a positive warning. Thanks!

mscc_ptp.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- 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_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);

2020-11-16 22:49:26

by Antoine Tenart

Subject: Re: [PATCH v2] net: phy: mscc: fix excluded_middle.cocci warnings

Hello Julia,

Quoting Julia Lawall (2020-11-16 16:34:44)
> From: kernel test robot <[email protected]>
>
> Condition !A || A && B is equivalent to !A || B.
>
> Generated by: scripts/coccinelle/misc/excluded_middle.cocci
>
> Fixes: b76f0ea01312 ("coccinelle: misc: add excluded_middle.cocci script")
> CC: Denis Efremov <[email protected]>
> Reported-by: kernel test robot <[email protected]>
> Signed-off-by: kernel test robot <[email protected]>
> Signed-off-by: Julia Lawall <[email protected]>

Reviewed-by: Antoine Tenart <[email protected]>

Thanks!
Antoine

> ---
>
> v2: add netdev mailing list
>
> tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
> head: e28c0d7c92c89016c12a677616668957351e7542
> commit: b76f0ea013125358d1b4ca147a6f9b6883dd2493 coccinelle: misc: add excluded_middle.cocci script
> :::::: branch date: 8 hours ago
> :::::: commit date: 8 weeks ago
>
> Please take the patch only if it's a positive warning. Thanks!
>
> mscc_ptp.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- 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_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);

2020-11-17 18:30:01

by Jakub Kicinski

Subject: Re: [PATCH v2] net: phy: mscc: fix excluded_middle.cocci warnings

On Mon, 16 Nov 2020 22:15:01 +0100 Antoine Tenart wrote:
> Quoting Julia Lawall (2020-11-16 16:34:44)
> > From: kernel test robot <[email protected]>
> >
> > Condition !A || A && B is equivalent to !A || B.
> >
> > Generated by: scripts/coccinelle/misc/excluded_middle.cocci
> >
> > Fixes: b76f0ea01312 ("coccinelle: misc: add excluded_middle.cocci script")
> > CC: Denis Efremov <[email protected]>
> > Reported-by: kernel test robot <[email protected]>
> > Signed-off-by: kernel test robot <[email protected]>
> > Signed-off-by: Julia Lawall <[email protected]>
>
> Reviewed-by: Antoine Tenart <[email protected]>

Applied, thanks!