Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Wan Jiabing <wanjiabing@vivo.com>
To:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Russell King <linux@armlinux.org.uk>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Cc:     kael_w@yeah.net, Wan Jiabing <wanjiabing@vivo.com>
Subject: [PATCH] net: mscc: ocelot: Fix dumplicated argument in ocelot
Date:   Mon, 11 Oct 2021 10:27:41 +0800
Message-Id: <20211011022742.3211-1-wanjiabing@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FaulhbnZ6LUkUp49Wyz8VgwwrS3awFsUF/7yDaZ2TXyG0Ojdt0oxUiOggH0w?=
 =?us-ascii?Q?V7btoLvHAtt8MY5hkF2SDYEATjnwkGuV8bz7AaaX7ZZXr5JdTXUvIO55p4HO?=
 =?us-ascii?Q?za3vLI3Sg+HMGiVZWghmFoxasyi8E5+8a0T1htJr+SIAyS7KEnKxhSfSgh5w?=
 =?us-ascii?Q?hnI02OtnnUuGxHUJc6HCRa3/Cmiq4fJMFmwG5qdZih45yUvjeau0gcQulPLI?=
 =?us-ascii?Q?SFlLaAPj2QX2ItkLb5NDmZLclmxJTz6qvGB+qWDFIjGwvS7YCwgCSt1fCU5i?=
 =?us-ascii?Q?NAlXdgcNsPx3MC6RRQwJaBRwC9GyRYC1VYib3qo7B5LlHCEdgLTa5kuPQU1J?=
 =?us-ascii?Q?nDwS5tNYPazfksLDf2A9oJMBY742R65oQuDxehtS+poKPudDyPI1jYSJV8ia?=
 =?us-ascii?Q?wYNhQ+bR8K6/G/Qz3HeO9WTEBaivye9MSgHtHxcADcQQ21zGniZQ0mModANK?=
 =?us-ascii?Q?B8MC+WBsLx22Lisofm/jfOHj01lRcLBOfo0r/i/YfR6weX4Qg96wV+3D59i7?=
 =?us-ascii?Q?X4iz4Nwgcud1za2XaXNNUrdl65Ec5IlzL1rGa2eSjvUJriWcHOJ82RVyL/HC?=
 =?us-ascii?Q?e2PpfXXON0PKmhoMPkcbKeXfEx3VKHBxksmNw3xuJzaFnNUacndxxpxa+R+T?=
 =?us-ascii?Q?bokUfEbY595mIoeFFuspysxGMN6iTyRue2CIjCv0GNe1wHxhOUu1WzevyEVo?=
 =?us-ascii?Q?QavXVNXDVavsLORUSmYOh+PcFtEZd9U1+HdC1S9Imz39e7Zam+EvdOqlpkz1?=
 =?us-ascii?Q?aNcR4REUQvauA/1a/kYcNTjyiNr93nKGHG6S0jj2hfiZin5jnlzKkNlmema2?=
 =?us-ascii?Q?zBZIqdR6MxSlSMq7YETVTkxXkFQSEOuZeR0QRWec7iYr8EW5ZNaS7B9+zzR2?=
 =?us-ascii?Q?5ij0HVf7HBD9J7NzdHuNZWWO8VSvCu528KYAsvXQeovbO6b1X36sb2NwgoKf?=
 =?us-ascii?Q?EE7mimIuZ0RClaeenLqxTnjF2nm/eqBJEJdYfZqjicPkKSrg3g/+6s4EeMLA?=
 =?us-ascii?Q?YqP/ii9hM3dzsjTwbHpi4lxZVMaRMI+kKut5p3vy9Cj1Evyv1R6d3Nj3AA7y?=
 =?us-ascii?Q?e5Nt/zgGbZK7ZNB0bUCLbZHAPoMktt3UtyzMJHD6kbc0S38sf7+nj9fAp0G4?=
 =?us-ascii?Q?Okg98/zbOy4d6tCauVUxf6APTZWWuADLIUGJovf+l0pogzbqJITsAsa5NeWo?=
 =?us-ascii?Q?z67/kAzgsG/yORmzCtVbuckMurP/xgDG+zW3a2bJ+coVqCEaQXo9jXvy1JtH?=
 =?us-ascii?Q?u2h2cDCY/lRIVjCf/oVUvbi8R/iGP70tf4GO7W8LFdKYEhdoqoGn/bZjvNKH?=
 =?us-ascii?Q?S+2jsCmoGaIAQeVtht0C1Js7?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 34037557-39c4-4952-1598-08d98c5ec146
X-MS-Exchange-CrossTenant-AuthSource: SG2PR06MB3367.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2021 02:28:05.0094
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: z8WyPjMSolvLZhWb0BB2NPHgEn1IlPdMSrPw2LlmaESS0ozqmQMBXl17u7d/R5PXua9oj20GeNBz8R8vPU/4UA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB2521
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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 <wanjiabing@vivo.com>
---
 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