[4.9,34/37] cavium/liquidio: Fix duplicate argument

Message ID	20210426072818.407428932@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Wan Jiabing <wanjiabing@vivo.com>, "David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 4.9 34/37] cavium/liquidio: Fix duplicate argument Date: Mon, 26 Apr 2021 09:29:35 +0200 Message-Id: <20210426072818.407428932@linuxfoundation.org> In-Reply-To: <20210426072817.245304364@linuxfoundation.org> References: <20210426072817.245304364@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,03/37] dmaengine: dw: Make it dependent to HAS_IOMEM [4.9,06/37] neighbour: Disregard DEAD dst in neigh_update [4.9,07/37] ARM: keystone: fix integer overflow warning [4.9,08/37] ASoC: fsl_esai: Fix TDM slot setup for I2S mode [4.9,10/37] net: ieee802154: stop dump llsec devs for monitors [4.9,12/37] net: ieee802154: stop dump llsec devkeys for monitors [4.9,14/37] net: ieee802154: stop dump llsec seclevels for monitors [4.9,17/37] Input: i8042 - fix Pegatron C15B ID entry [4.9,18/37] scsi: libsas: Reset num_scatter if libata marks qc as NODATA [4.9,19/37] net: davicom: Fix regulator not turned off on failed probe [4.9,20/37] net: sit: Unregister catch-all devices [4.9,23/37] usbip: Fix incorrect double assignment to udc->ud.tcp_rx [4.9,26/37] usbip: vudc synchronize sysfs code paths [4.9,28/37] net: hso: fix null-ptr-deref during tty device unregistration [4.9,30/37] HID: alps: fix error return code in alps_input_configured() [4.9,34/37] cavium/liquidio: Fix duplicate argument [4.9,35/37] ia64: fix discontig.c section mismatches

Message ID

20210426072818.407428932@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	stable@vger.kernel.org, Wan Jiabing <wanjiabing@vivo.com>,
	"David S. Miller" <davem@davemloft.net>, Sasha Levin <sashal@kernel.org>
Subject: [PATCH 4.9 34/37] cavium/liquidio: Fix duplicate argument
Date: Mon, 26 Apr 2021 09:29:35 +0200
Message-Id: <20210426072818.407428932@linuxfoundation.org>
In-Reply-To: <20210426072817.245304364@linuxfoundation.org>
References: <20210426072817.245304364@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg KH April 26, 2021, 7:29 a.m. UTC

From: Wan Jiabing <wanjiabing@vivo.com>

[ Upstream commit 416dcc5ce9d2a810477171c62ffa061a98f87367 ]

Fix the following coccicheck warning:

./drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h:413:6-28:
duplicated argument to & or |

The CN6XXX_INTR_M1UPB0_ERR here is duplicate.
Here should be CN6XXX_INTR_M1UNB0_ERR.

Signed-off-by: Wan Jiabing <wanjiabing@vivo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h b/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
index 5e3aff242ad3..3ab84d18ad3a 100644
--- a/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
+++ b/drivers/net/ethernet/cavium/liquidio/cn66xx_regs.h
@@ -417,7 +417,7 @@ 
 	   | CN6XXX_INTR_M0UNWI_ERR             \
 	   | CN6XXX_INTR_M1UPB0_ERR             \
 	   | CN6XXX_INTR_M1UPWI_ERR             \
-	   | CN6XXX_INTR_M1UPB0_ERR             \
+	   | CN6XXX_INTR_M1UNB0_ERR             \
 	   | CN6XXX_INTR_M1UNWI_ERR             \
 	   | CN6XXX_INTR_INSTR_DB_OF_ERR        \
 	   | CN6XXX_INTR_SLIST_DB_OF_ERR        \

[4.9,34/37] cavium/liquidio: Fix duplicate argument

Commit Message

Patch