From: Ian Molton <ian@mnementh.co.uk>
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, 26 Jul 2017 21:25:47 +0100 [thread overview]
Message-ID: <20170726202557.15632-25-ian@mnementh.co.uk> (raw)
In-Reply-To: <20170726202557.15632-1-ian@mnementh.co.uk>
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 <ian@mnementh.co.uk>
---
.../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 9cfabf4a7f62..0b70d61cc912 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
@@ -222,18 +222,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)
@@ -1018,7 +1018,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);
}
@@ -1089,12 +1089,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;
@@ -1118,9 +1118,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;
@@ -1241,7 +1241,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);
@@ -1267,7 +1267,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);
@@ -1294,7 +1294,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 060bfa896bf1..680875423f91 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);
--
2.11.0
next prev parent reply other threads:[~2017-07-26 20:46 UTC|newest]
Thread overview: 85+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-26 20:25 Patch v4: Clean up brcmfmac driver Ian Molton
2017-07-26 20:25 ` [PATCH 01/34] brcmfmac: Fix parameter order in brcmf_sdiod_f0_writeb() Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-19 19:52 ` Ian Molton
2017-07-26 20:25 ` [PATCH 02/34] brcmfmac: Register sizes on hardware are not dependent on compiler types Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 03/34] brcmfmac: Split brcmf_sdiod_regrw_helper() up Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-07 17:49 ` Ian Molton
2017-07-26 20:25 ` [PATCH 04/34] brcmfmac: Clean up brcmf_sdiod_set_sbaddr_window() Ian Molton
2017-08-05 20:08 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 05/34] brcmfmac: Remove dead IO code Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 06/34] brcmfmac: Remove bandaid for SleepCSR Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-19 20:57 ` Ian Molton
2017-07-26 20:25 ` [PATCH 07/34] brcmfmac: Remove brcmf_sdiod_request_data() Ian Molton
2017-08-07 11:25 ` Arend van Spriel
2017-08-07 17:51 ` Ian Molton
2017-08-19 20:02 ` Ian Molton
2017-08-30 19:32 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 08/34] brcmfmac: Fix uninitialised variable Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-19 21:06 ` Ian Molton
2017-07-26 20:25 ` [PATCH 09/34] brcmfmac: Remove noisy debugging Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-19 20:18 ` Ian Molton
2017-07-26 20:25 ` [PATCH 10/34] brcmfmac: Rename bcmerror to err Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 11/34] brcmfmac: Split brcmf_sdiod_buffrw function up Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-19 21:41 ` Ian Molton
2017-07-26 20:25 ` [PATCH 12/34] brcmfmac: Replace old IO functions with simpler ones Ian Molton
2017-08-07 11:26 ` Arend van Spriel
2017-08-07 17:55 ` Ian Molton
2017-08-19 21:50 ` Ian Molton
2017-07-26 20:25 ` [PATCH 13/34] brcmfmac: Tidy register definitions a little Ian Molton
2017-08-07 19:30 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 14/34] brcmfmac: Remove brcmf_sdiod_addrprep() Ian Molton
2017-08-07 11:27 ` Arend van Spriel
2017-08-19 20:27 ` Ian Molton
2017-07-26 20:25 ` [PATCH 15/34] brcmfamc: remove unnecessary call to brcmf_sdiod_set_backplane_window() Ian Molton
2017-08-07 11:11 ` Arend van Spriel
2017-08-07 11:54 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 16/34] brcmfmac: Cleanup offsetof() Ian Molton
2017-07-26 20:25 ` [PATCH 17/34] brcmfmac: Remove unused macro Ian Molton
2017-07-26 20:25 ` [PATCH 18/34] brcmfmac: Rename SOC_AI to SOC_AXI Ian Molton
2017-07-26 20:25 ` [PATCH 19/34] brcmfmac: Get rid of chip_priv and core_priv structs Ian Molton
2017-07-29 10:12 ` kbuild test robot
2017-07-26 20:25 ` [PATCH 20/34] brcmfmac: Whitespace patch Ian Molton
2017-07-26 20:25 ` [PATCH 21/34] brcmfmac: Simplify chip probe routine Ian Molton
2017-07-26 20:25 ` [PATCH 22/34] brcmfmac: Rename axi functions for clarity Ian Molton
2017-07-26 20:25 ` [PATCH 23/34] brcmfmac: HUGE cleanup of IO access functions Ian Molton
2017-07-26 20:25 ` Ian Molton [this message]
2017-07-26 20:25 ` [PATCH 25/34] brcmfmac: Remove repeated calls to brcmf_chip_get_core() Ian Molton
2017-07-26 20:25 ` [PATCH 26/34] brcmfmac: General cleaning up. whitespace and comments fix Ian Molton
2017-07-26 20:25 ` [PATCH 27/34] brcmfmac: Remove {r,w}_sdreg32 Ian Molton
2017-07-26 20:25 ` [PATCH 28/34] brcmfmac: Rename buscore->core for consistency Ian Molton
2017-07-26 20:25 ` [PATCH 29/34] brcmfmac: stabilise the value of ->sbwad in use for some xfer routines Ian Molton
2017-08-07 12:32 ` Arend van Spriel
2017-08-19 20:31 ` Ian Molton
2017-07-26 20:25 ` [PATCH 30/34] brcmfmac: Correctly handle accesses to SDIO func0 Ian Molton
2017-08-08 12:36 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 31/34] brcmfmac: Remove func0 from function array Ian Molton
2017-08-08 11:19 ` Arend van Spriel
2017-08-08 11:27 ` Ian Molton
2017-08-08 12:33 ` Arend van Spriel
2017-08-19 20:33 ` Ian Molton
2017-07-26 20:25 ` [PATCH 32/34] brcmfmac: Replace function index with function pointer Ian Molton
2017-07-28 15:55 ` [PATCH] brcmfmac: fix semicolon.cocci warnings kbuild test robot
2017-07-28 15:55 ` [PATCH 32/34] brcmfmac: Replace function index with function pointer kbuild test robot
2017-08-08 12:29 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 33/34] brcmfmac: Remove array of functions Ian Molton
2017-08-08 12:29 ` Arend van Spriel
2017-07-26 20:25 ` [PATCH 34/34] brcmfmac: Reduce the noise from repeatedly dereferencing common pointers Ian Molton
2017-08-08 12:29 ` Arend van Spriel
2017-08-19 20:39 ` Ian Molton
2017-07-27 6:17 ` Patch v4: Clean up brcmfmac driver Kalle Valo
2017-07-27 9:47 ` Ian Molton
2017-07-27 9:52 ` Arend van Spriel
2017-07-27 10:00 ` Ian Molton
2017-07-27 10:09 ` Arend van Spriel
2017-07-27 10:12 ` Ian Molton
2017-07-27 10:31 ` Kalle Valo
-- strict thread matches above, loose matches on Subject: below --
2017-07-19 19:07 PATCH v3 brcmfmac driver cleanup Ian Molton
2017-07-19 19:08 ` [PATCH 24/34] brcmfmac: Rename chip.ctx -> chip.bus_priv Ian Molton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170726202557.15632-25-ian@mnementh.co.uk \
--to=ian@mnementh.co.uk \
--cc=arend.vanspriel@broadcom.com \
--cc=franky.lin@broadcom.com \
--cc=hante.meuleman@broadcom.com \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).