From patchwork Wed Oct 21 14:55:23 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Punit Vara X-Patchwork-Id: 533873 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id C6A1A140DAF for ; Thu, 22 Oct 2015 02:05:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=S6XAb59v; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755228AbbJUO4w (ORCPT ); Wed, 21 Oct 2015 10:56:52 -0400 Received: from mail-wi0-f193.google.com ([209.85.212.193]:33248 "EHLO mail-wi0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755159AbbJUO4s (ORCPT ); Wed, 21 Oct 2015 10:56:48 -0400 Received: by wiut4 with SMTP id t4so12998378wiu.0; Wed, 21 Oct 2015 07:56:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nEluIw9ePRg2xCgCwgv1O/0Oa1mnFlTbSn+7u4mACCE=; b=S6XAb59vGppg3XzW8IxleDXVACvAENpek5rEgvxG+GR4UxKpB1aTKhvGg+2ezsIOji xgqR41ynlGbqa06rj+h3HiIgZb7QWkhCxKgs0kLFhQZZAjgEbKs8v8QYUX4g2vzAsmZ9 qoc8QYy65CKFco4L+OnHXzXiXqb3uTRMSKTNNQspr8aB/Ylz6W656in7f1LhbzgsmEF2 HRevE+t2gAgMiOv43kUVnv8o2JCi+Nd2/ZhNf2YRejdjB1EoVUXHfPHWaqWg0KrOHvNy hCVMgDhcgGQeUGAVTab4dj+PEO4bN02pgZwgNJScFAFHF7bYImXjE2pa6x6to2FU7QYt QCYQ== X-Received: by 10.181.27.138 with SMTP id jg10mr36208599wid.29.1445439406605; Wed, 21 Oct 2015 07:56:46 -0700 (PDT) Received: from localhost.localdomain ([163.47.15.42]) by smtp.gmail.com with ESMTPSA id o10sm7659201wia.4.2015.10.21.07.56.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 21 Oct 2015 07:56:45 -0700 (PDT) From: Punit Vara To: kvalo@qca.qualcomm.com Cc: stas.yakovlev@gmail.com, chaoming_li@realsil.com.cn, Larry.Finger@lwfinger.net, chunkeey@googlemail.com, sgruszka@redhat.com, brudley@broadcom.com, arend@broadcom.com, linville@tuxdriver.com, jirislaby@gmail.com, mickflemm@gmail.com, mcgrof@do-not-panic.com, k.eugene.e@gmail.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, brcm80211-dev-list@broadcom.com, wcn36xx@lists.infradead.org, johannes.berg@intel.com, meuleman@broadcom.com, Punit Vara Subject: [PATCH 01/15] net: wireless: ath: use | instead of + for summing bitmasks Date: Wed, 21 Oct 2015 20:25:23 +0530 Message-Id: <1445439337-19055-2-git-send-email-punitvara@gmail.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1445439337-19055-1-git-send-email-punitvara@gmail.com> References: <1445439337-19055-1-git-send-email-punitvara@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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: