From patchwork Sun Jul 16 11:21:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Molton X-Patchwork-Id: 9842903 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9B2BA603B4 for ; Sun, 16 Jul 2017 11:43:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9354828484 for ; Sun, 16 Jul 2017 11:43:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 884F0284FE; Sun, 16 Jul 2017 11:43:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D7A7284D2 for ; Sun, 16 Jul 2017 11:43:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751275AbdGPLnM (ORCPT ); Sun, 16 Jul 2017 07:43:12 -0400 Received: from [217.148.43.144] ([217.148.43.144]:46236 "EHLO mnementh.co.uk" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751087AbdGPLnL (ORCPT ); Sun, 16 Jul 2017 07:43:11 -0400 Received: from 12.3.208.46.dyn.plus.net ([46.208.3.12] helo=localhost.localdomain) by mnementh.co.uk with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1dWhcu-00083y-UX; Sun, 16 Jul 2017 11:22:18 +0000 From: Ian Molton To: linux-wireless@vger.kernel.org Cc: arend.vanspriel@broadcom.com, franky.lin@broadcom.com, hante.meuleman@broadcom.com Subject: [PATCH 16/21] brcmfmac: rename axi functions for clarity Date: Sun, 16 Jul 2017 12:21:24 +0100 Message-Id: <20170716112129.10206-17-ian@mnementh.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170716112129.10206-1-ian@mnementh.co.uk> References: <20170716112129.10206-1-ian@mnementh.co.uk> X-Spam_score: -2.9 X-Spam_score_int: -28 X-Spam_bar: -- X-Spam_report: Spam detection software, running on the system "mnementh.co.uk", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index b3b28e78c49d..1485463794ff 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -239, 7 +239, 7 @@ static bool brcmf_chip_sb_iscoreup(struct brcmf_core *core) return SSB_TMSLOW_CLOCK == regdata; } [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP 0.0 TVD_RCVD_IP Message was received from an IP address -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index b3b28e78c49d..1485463794ff 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -239,7 +239,7 @@ static bool brcmf_chip_sb_iscoreup(struct brcmf_core *core) return SSB_TMSLOW_CLOCK == regdata; } -static bool brcmf_chip_ai_iscoreup(struct brcmf_core *core) +static bool brcmf_chip_axi_iscoreup(struct brcmf_core *core) { struct brcmf_chip *ci = core->chip; u32 regdata; @@ -340,7 +340,7 @@ static void brcmf_chip_sb_coredisable(struct brcmf_core *core, udelay(1); } -static void brcmf_chip_ai_coredisable(struct brcmf_core *core, +static void brcmf_chip_axi_coredisable(struct brcmf_core *core, u32 prereset, u32 reset) { struct brcmf_chip *ci = core->chip; @@ -432,14 +432,14 @@ static void brcmf_chip_sb_resetcore(struct brcmf_core *core, u32 prereset, udelay(1); } -static void brcmf_chip_ai_resetcore(struct brcmf_core *core, u32 prereset, +static void brcmf_chip_axi_resetcore(struct brcmf_core *core, u32 prereset, u32 reset, u32 postreset) { struct brcmf_chip *ci = core->chip; int count; /* must disable first to work for arbitrary current core state */ - brcmf_chip_ai_coredisable(core, prereset, reset); + brcmf_chip_axi_coredisable(core, prereset, reset); count = 0; @@ -1007,9 +1007,9 @@ static int brcmf_chip_probe(struct brcmf_chip *ci) if (brcmf_chip_dmp_erom_scan(ci)) return -ENODEV; - ci->iscoreup = brcmf_chip_ai_iscoreup; - ci->coredisable = brcmf_chip_ai_coredisable; - ci->resetcore = brcmf_chip_ai_resetcore; + ci->iscoreup = brcmf_chip_axi_iscoreup; + ci->coredisable = brcmf_chip_axi_coredisable; + ci->resetcore = brcmf_chip_axi_resetcore; break; default: