linux-kernel - [PATCH 01/15] net: wireless: ath: use | instead of + for summing bitmasks

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Wed, 21 Oct 2015 20:25:23 +0530
From:	Punit Vara <punitvara@...il.com>
To:	kvalo@....qualcomm.com
Cc:	stas.yakovlev@...il.com, chaoming_li@...lsil.com.cn,
	Larry.Finger@...inger.net, chunkeey@...glemail.com,
	sgruszka@...hat.com, brudley@...adcom.com, arend@...adcom.com,
	linville@...driver.com, jirislaby@...il.com, mickflemm@...il.com,
	mcgrof@...not-panic.com, k.eugene.e@...il.com,
	netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
	brcm80211-dev-list@...adcom.com, wcn36xx@...ts.infradead.org,
	johannes.berg@...el.com, meuleman@...adcom.com,
	Punit Vara <punitvara@...il.com>
Subject: [PATCH 01/15] net: wireless: ath: use | instead of + for summing bitmasks

This patch is to the ath10k/pci.h file that fixes following warning
 reported by coccicheck:

WARNING: sum of probable bitmasks, consider |

I have replaced + with OR operator | for summing bitmasks

Signed-off-by: Punit Vara <punitvara@...il.com>
---
 drivers/net/wireless/ath/ath10k/pci.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
index 1046ab6..165a318 100644
--- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -775,7 +775,7 @@ static u32 ath10k_pci_targ_cpu_to_ce_addr(struct ath10k *ar, u32 addr)
 	switch (ar->hw_rev) {
 	case ATH10K_HW_QCA988X:
 	case ATH10K_HW_QCA6174:
-		val = (ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
+		val = (ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS |
 					  CORE_CTRL_ADDRESS) &
 		       0x7ff) << 21;
 		break;
@@ -1443,10 +1443,10 @@ static void ath10k_pci_irq_msi_fw_mask(struct ath10k *ar)
 	switch (ar->hw_rev) {
 	case ATH10K_HW_QCA988X:
 	case ATH10K_HW_QCA6174:
-		val = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
+		val = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS |
 					CORE_CTRL_ADDRESS);
 		val &= ~CORE_CTRL_PCIE_REG_31_MASK;
-		ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS +
+		ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS |
 				   CORE_CTRL_ADDRESS, val);
 		break;
 	case ATH10K_HW_QCA99X0:
@@ -1464,10 +1464,10 @@ static void ath10k_pci_irq_msi_fw_unmask(struct ath10k *ar)
 	switch (ar->hw_rev) {
 	case ATH10K_HW_QCA988X:
 	case ATH10K_HW_QCA6174:
-		val = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS +
+		val = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS |
 					CORE_CTRL_ADDRESS);
 		val |= CORE_CTRL_PCIE_REG_31_MASK;
-		ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS +
+		ath10k_pci_write32(ar, SOC_CORE_BASE_ADDRESS |
 				   CORE_CTRL_ADDRESS, val);
 		break;
 	case ATH10K_HW_QCA99X0:
-- 
2.5.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/