Thread (25 messages) flat view 25 messages, 5 authors, 2015-10-22

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

From: Sergei Shtylyov <hidden>
Date: 2015-10-21 21:43:56
Also in: lkml

Hello.

On 10/21/2015 05:55 PM, Punit Vara wrote:
This patch is to the ath10k/pci.h file that fixes following warning
    pci.c, you mean?
quoted hunk ↗ jump to hunk
  reported by coccicheck:

WARNING: sum of probable bitmasks, consider |

I have replaced + with OR operator | for summing bitmasks

Signed-off-by: Punit Vara <redacted>
---
  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 |
    Don't think these 2 are justified.

quoted hunk ↗ jump to hunk
@@ -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);
    And these too.

[...]

MBR, Sergei
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help