From patchwork Wed Jul 19 19:08:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Molton X-Patchwork-Id: 9853067 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 CFB23602BD for ; Wed, 19 Jul 2017 19:12:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BBD802656B for ; Wed, 19 Jul 2017 19:12:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0972286B4; Wed, 19 Jul 2017 19:12:13 +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 2C5D62656B for ; Wed, 19 Jul 2017 19:12:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754501AbdGSTML (ORCPT ); Wed, 19 Jul 2017 15:12:11 -0400 Received: from [217.148.43.144] ([217.148.43.144]:58820 "EHLO mnementh.co.uk" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1752760AbdGSTMK (ORCPT ); Wed, 19 Jul 2017 15:12:10 -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 1dXuLB-00068l-71; Wed, 19 Jul 2017 19:08:57 +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 24/34] brcmfmac: Rename chip.ctx -> chip.bus_priv Date: Wed, 19 Jul 2017 20:08:12 +0100 Message-Id: <20170719190822.10857-25-ian@mnementh.co.uk> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170719190822.10857-1-ian@mnementh.co.uk> References: <20170719190822.10857-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: This driver uses the label ctx like its going out of fashion. Lets rename this usage of it so that its easier to see whats going on. Signed-off-by: Ian Molton --- .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 24 +++++++++++ .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 16 +++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) [...] 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 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: mnementh.co.uk] -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 This driver uses the label ctx like its going out of fashion. Lets rename this usage of it so that its easier to see whats going on. Signed-off-by: Ian Molton --- .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 24 +++++++++++----------- .../wireless/broadcom/brcm80211/brcmfmac/chip.h | 16 +++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c index bab1bb3e99ae..ae21f16b31de 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c @@ -225,18 +225,18 @@ struct sbsocramregs { static inline int brcmf_readl(struct brcmf_chip *chip, u32 addr) { - return chip->ops->read32(chip->ctx, addr); + return chip->ops->read32(chip->bus_priv, addr); } static inline void brcmf_writel(struct brcmf_chip *chip, u32 addr, u32 v) { - chip->ops->write32(chip->ctx, addr, v); + chip->ops->write32(chip->bus_priv, addr, v); } static inline void brcmf_writelp(struct brcmf_chip *chip, u32 addr, u32 v) { - chip->ops->write32(chip->ctx, addr, v); - chip->ops->read32(chip->ctx, addr); + chip->ops->write32(chip->bus_priv, addr, v); + chip->ops->read32(chip->bus_priv, addr); } static void brcmf_clear_bits(struct brcmf_chip *ci, u32 reg, u32 bits) @@ -1025,7 +1025,7 @@ static int brcmf_chip_probe(struct brcmf_chip *ci) * specific reset at this point. */ if (ci->ops->reset) { - ci->ops->reset(ci->ctx, ci); + ci->ops->reset(ci->bus_priv, ci); brcmf_chip_set_passive(ci); } @@ -1097,12 +1097,12 @@ static int brcmf_chip_setup(struct brcmf_chip *chip) /* execute bus core specific setup */ if (chip->ops->setup) - ret = chip->ops->setup(chip->ctx, chip); + ret = chip->ops->setup(chip->bus_priv, chip); return ret; } -struct brcmf_chip *brcmf_chip_attach(void *ctx, +struct brcmf_chip *brcmf_chip_attach(void *bus_priv, const struct brcmf_buscore_ops *ops) { struct brcmf_chip *chip; @@ -1126,9 +1126,9 @@ struct brcmf_chip *brcmf_chip_attach(void *ctx, INIT_LIST_HEAD(&chip->cores); chip->num_cores = 0; chip->ops = ops; - chip->ctx = ctx; + chip->bus_priv = bus_priv; - err = ops->prepare(ctx); + err = ops->prepare(bus_priv); if (err < 0) goto fail; @@ -1249,7 +1249,7 @@ static bool brcmf_chip_cm3_set_active(struct brcmf_chip *chip) return false; } - chip->ops->activate(chip->ctx, chip, 0); + chip->ops->activate(chip->bus_priv, chip, 0); core = brcmf_chip_get_core(chip, BCMA_CORE_ARM_CM3); brcmf_chip_resetcore(core, 0, 0, 0); @@ -1275,7 +1275,7 @@ static bool brcmf_chip_cr4_set_active(struct brcmf_chip *chip, u32 rstvec) { struct brcmf_core *core; - chip->ops->activate(chip->ctx, chip, rstvec); + chip->ops->activate(chip->bus_priv, chip, rstvec); /* restore ARM */ core = brcmf_chip_get_core(chip, BCMA_CORE_ARM_CR4); @@ -1302,7 +1302,7 @@ static bool brcmf_chip_ca7_set_active(struct brcmf_chip *chip, u32 rstvec) { struct brcmf_core *core; - chip->ops->activate(chip->ctx, chip, rstvec); + chip->ops->activate(chip->bus_priv, chip, rstvec); /* restore ARM */ core = brcmf_chip_get_core(chip, BCMA_CORE_ARM_CA7); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h index 0babb328d155..8698abfb806e 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h @@ -50,7 +50,7 @@ struct brcmf_chip { void (*resetcore)(struct brcmf_core *core, u32 prereset, u32 reset, u32 postreset); - void *ctx; + void *bus_priv; u32 chip; u32 chiprev; @@ -94,15 +94,15 @@ struct brcmf_core { * The callback should use the provided @rstvec when non-zero. */ struct brcmf_buscore_ops { - u32 (*read32)(void *ctx, u32 addr); - void (*write32)(void *ctx, u32 addr, u32 value); - int (*prepare)(void *ctx); - int (*reset)(void *ctx, struct brcmf_chip *chip); - int (*setup)(void *ctx, struct brcmf_chip *chip); - void (*activate)(void *ctx, struct brcmf_chip *chip, u32 rstvec); + u32 (*read32)(void *bus_priv, u32 addr); + void (*write32)(void *bus_priv, u32 addr, u32 value); + int (*prepare)(void *bus_priv); + int (*reset)(void *bus_priv, struct brcmf_chip *chip); + int (*setup)(void *bus_priv, struct brcmf_chip *chip); + void (*activate)(void *bus_priv, struct brcmf_chip *chip, u32 rstvec); }; -struct brcmf_chip *brcmf_chip_attach(void *ctx, +struct brcmf_chip *brcmf_chip_attach(void *bus_priv, const struct brcmf_buscore_ops *ops); void brcmf_chip_detach(struct brcmf_chip *chip); struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *chip, u16 coreid);