2021-10-11 03:10:45

by Jiabing Wan

Subject: [PATCH] net: mscc: ocelot: Fix dumplicated argument in ocelot

Fix the following coccicheck warning:
drivers/net/ethernet/mscc/ocelot.c:474:duplicated argument to & or |
drivers/net/ethernet/mscc/ocelot.c:476:duplicated argument to & or |
drivers/net/ethernet/mscc/ocelot_net.c:1627:duplicated argument
to & or |

These DEV_CLOCK_CFG_MAC_TX_RST are duplicate here.
Here should be DEV_CLOCK_CFG_MAC_RX_RST.

Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink")
Signed-off-by: Wan Jiabing <[email protected]>
---
drivers/net/ethernet/mscc/ocelot.c | 4 ++--
drivers/net/ethernet/mscc/ocelot_net.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mscc/ocelot.c b/drivers/net/ethernet/mscc/ocelot.c
index 559177e6ded4..4de58321907c 100644
--- a/drivers/net/ethernet/mscc/ocelot.c
+++ b/drivers/net/ethernet/mscc/ocelot.c
@@ -472,9 +472,9 @@ void ocelot_phylink_mac_link_down(struct ocelot *ocelot, int port,
!(quirks & OCELOT_QUIRK_QSGMII_PORTS_MUST_BE_UP))
ocelot_port_rmwl(ocelot_port,
DEV_CLOCK_CFG_MAC_TX_RST |
- DEV_CLOCK_CFG_MAC_TX_RST,
+ DEV_CLOCK_CFG_MAC_RX_RST,
DEV_CLOCK_CFG_MAC_TX_RST |
- DEV_CLOCK_CFG_MAC_TX_RST,
+ DEV_CLOCK_CFG_MAC_RX_RST,
DEV_CLOCK_CFG);
}
EXPORT_SYMBOL_GPL(ocelot_phylink_mac_link_down);
diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index e54b9fb2a97a..2a85bcb5d0c2 100644
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -1625,7 +1625,7 @@ static int ocelot_port_phylink_create(struct ocelot *ocelot, int port,
if (phy_mode == PHY_INTERFACE_MODE_QSGMII)
ocelot_port_rmwl(ocelot_port, 0,
DEV_CLOCK_CFG_MAC_TX_RST |
- DEV_CLOCK_CFG_MAC_TX_RST,
+ DEV_CLOCK_CFG_MAC_RX_RST,
DEV_CLOCK_CFG);

ocelot_port->phy_mode = phy_mode;
--
2.30.2

2021-10-11 16:28:35

by Vladimir Oltean

Subject: Re: [PATCH] net: mscc: ocelot: Fix dumplicated argument in ocelot

On Mon, Oct 11, 2021 at 10:27:41AM +0800, Wan Jiabing wrote:
> Fix the following coccicheck warning:
> drivers/net/ethernet/mscc/ocelot.c:474:duplicated argument to & or |
> drivers/net/ethernet/mscc/ocelot.c:476:duplicated argument to & or |
> drivers/net/ethernet/mscc/ocelot_net.c:1627:duplicated argument
> to & or |
>
> These DEV_CLOCK_CFG_MAC_TX_RST are duplicate here.
> Here should be DEV_CLOCK_CFG_MAC_RX_RST.
>
> Fixes: e6e12df625f2 ("net: mscc: ocelot: convert to phylink")
> Signed-off-by: Wan Jiabing <[email protected]>
> ---

Reviewed-by: Vladimir Oltean <[email protected]>

2021-10-12 10:34:49

by patchwork-bot+netdevbpf

Subject: Re: [PATCH] net: mscc: ocelot: Fix dumplicated argument in ocelot

Hello:

This patch was applied to netdev/net.git (master)
by David S. Miller <[email protected]>:

On Mon, 11 Oct 2021 10:27:41 +0800 you wrote:
> Fix the following coccicheck warning:
> drivers/net/ethernet/mscc/ocelot.c:474:duplicated argument to & or |
> drivers/net/ethernet/mscc/ocelot.c:476:duplicated argument to & or |
> drivers/net/ethernet/mscc/ocelot_net.c:1627:duplicated argument
> to & or |
>
> These DEV_CLOCK_CFG_MAC_TX_RST are duplicate here.
> Here should be DEV_CLOCK_CFG_MAC_RX_RST.
>
> [...]

Here is the summary with links:
- net: mscc: ocelot: Fix dumplicated argument in ocelot
https://git.kernel.org/netdev/net/c/74a3bc42fe51

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html