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 28/34] brcmfmac: Rename buscore->core for consistency
Date: Wed, 19 Jul 2017 20:08:16 +0100 [thread overview]
Message-ID: <20170719190822.10857-29-ian@mnementh.co.uk> (raw)
In-Reply-To: <20170719190822.10857-1-ian@mnementh.co.uk>
Avoid confusion with unrelated _buscore labels.
Signed-off-by: Ian Molton <ian@mnementh.co.uk>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index cc83388b8c72..19f40a1ee418 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -2466,14 +2466,11 @@ static inline void brcmf_sdio_clrintr(struct brcmf_sdio *bus)
static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)
{
- struct brcmf_core *buscore = bus->sdio_core;
- u32 addr;
+ struct brcmf_core *core = bus->sdio_core;
unsigned long val;
int ret;
- addr = buscore->base + __sd_reg(intstatus);
-
- val = brcmf_sdiod_readl(bus->sdiodev, addr, &ret);
+ val = brcmf_sdiod_readl(bus->sdiodev, core->base + __sd_reg(intstatus), &ret);
bus->sdcnt.f1regdata++;
if (ret != 0)
return ret;
@@ -2483,7 +2480,8 @@ static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)
/* Clear interrupts */
if (val) {
- brcmf_sdiod_writel(bus->sdiodev, addr, val, &ret);
+ brcmf_sdiod_writel(bus->sdiodev, core->base + __sd_reg(intstatus),
+ val, &ret);
bus->sdcnt.f1regdata++;
atomic_or(val, &bus->intstatus);
}
--
2.11.0
next prev parent reply other threads:[~2017-07-19 19:15 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-19 19:07 PATCH v3 brcmfmac driver cleanup Ian Molton
2017-07-19 19:07 ` [PATCH 01/34] brcmfmac: Fix parameter order in brcmf_sdiod_f0_writeb() Ian Molton
2017-07-19 19:07 ` [PATCH 02/34] brcmfmac: Register sizes on hardware are not dependent on compiler types Ian Molton
2017-07-19 19:07 ` [PATCH 03/34] brcmfmac: Split brcmf_sdiod_regrw_helper() up Ian Molton
2017-07-19 19:07 ` [PATCH 04/34] brcmfmac: Clean up brcmf_sdiod_set_sbaddr_window() Ian Molton
2017-07-19 19:07 ` [PATCH 05/34] brcmfmac: Remove dead IO code Ian Molton
2017-07-19 19:07 ` [PATCH 06/34] brcmfmac: Remove bandaid for SleepCSR Ian Molton
2017-07-19 19:07 ` [PATCH 07/34] brcmfmac: Remove brcmf_sdiod_request_data() Ian Molton
2017-07-19 19:07 ` [PATCH 08/34] brcmfmac: Fix uninitialised variable Ian Molton
2017-07-19 19:07 ` [PATCH 09/34] brcmfmac: Remove noisy debugging Ian Molton
2017-07-19 19:07 ` [PATCH 10/34] brcmfmac: Rename bcmerror to err Ian Molton
2017-07-19 19:07 ` [PATCH 11/34] brcmfmac: Split brcmf_sdiod_buffrw function up Ian Molton
2017-07-19 19:08 ` [PATCH 12/34] brcmfmac: Replace old IO functions with simpler ones Ian Molton
2017-07-19 19:08 ` [PATCH 13/34] brcmfmac: Tidy register definitions a little Ian Molton
2017-07-19 19:08 ` [PATCH 14/34] brcmfmac: Remove brcmf_sdiod_addrprep() Ian Molton
2017-07-19 19:08 ` [PATCH 15/34] brcmfamc: remove unnecessary call to brcmf_sdiod_set_backplane_window() Ian Molton
2017-07-19 19:08 ` [PATCH 16/34] brcmfmac: Cleanup offsetof() Ian Molton
2017-07-19 19:08 ` [PATCH 17/34] brcmfmac: Remove unused macro Ian Molton
2017-07-19 19:08 ` [PATCH 18/34] brcmfmac: Rename SOC_AI to SOC_AXI Ian Molton
2017-07-19 19:08 ` [PATCH 19/34] brcmfmac: Get rid of chip_priv and core_priv structs Ian Molton
2017-07-19 19:08 ` [PATCH 20/34] brcmfmac: Whitespace patch Ian Molton
2017-07-19 19:08 ` [PATCH 21/34] brcmfmac: Simplify chip probe routine Ian Molton
2017-07-19 19:08 ` [PATCH 22/34] brcmfmac: Rename axi functions for clarity Ian Molton
2017-07-19 19:08 ` [PATCH 23/34] brcmfmac: HUGE cleanup of IO access functions Ian Molton
2017-07-19 19:08 ` [PATCH 24/34] brcmfmac: Rename chip.ctx -> chip.bus_priv Ian Molton
2017-07-19 19:08 ` [PATCH 25/34] brcmfmac: Remove repeated calls to brcmf_chip_get_core() Ian Molton
2017-07-19 19:08 ` [PATCH 26/34] brcmfmac: General cleaning up. whitespace and comments fix Ian Molton
2017-07-19 19:08 ` [PATCH 27/34] brcmfmac: Remove {r,w}_sdreg32 Ian Molton
2017-07-19 19:08 ` Ian Molton [this message]
2017-07-19 19:08 ` [PATCH 29/34] brcmfmac: stabilise the value of ->sbwad in use for some xfer routines Ian Molton
2017-07-19 19:08 ` [PATCH 30/34] brcmfmac: Correctly handle accesses to SDIO func0 Ian Molton
2017-07-19 19:08 ` [PATCH 31/34] brcmfmac: Remove func0 from function array Ian Molton
2017-07-19 19:08 ` [PATCH 32/34] brcmfmac: Replace function index with function pointer Ian Molton
2017-07-19 19:08 ` [PATCH 33/34] brcmfmac: Remove array of functions Ian Molton
2017-07-19 19:08 ` [PATCH 34/34] brcmfmac: Reduce the noise from repeatedly dereferencing common pointers Ian Molton
2017-07-24 19:47 ` PATCH v3 brcmfmac driver cleanup Arend van Spriel
2017-07-26 10:23 ` Ian Molton
2017-07-26 20:25 Patch v4: Clean up brcmfmac driver Ian Molton
2017-07-26 20:25 ` [PATCH 28/34] brcmfmac: Rename buscore->core for consistency 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=20170719190822.10857-29-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).