[22/30] brcmfmac: Rename buscore->core for consistency

Commit Message

Ian Molton Aug. 22, 2017, 11:25 a.m. UTC

Avoid confusion with unrelated _buscore labels.

Signed-off-by: Ian Molton <[e-mail]>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Comments

Arend van Spriel Sept. 5, 2017, 9:20 p.m. UTC | #1

On 22-08-17 13:25, Ian Molton wrote:
> Avoid confusion with unrelated _buscore labels.

Acked-by: Arend van Spriel <[e-mail]>
> Signed-off-by: Ian Molton <[e-mail]>
> ---
>   drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 11 +++++------
>   1 file changed, 5 insertions(+), 6 deletions(-)

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index c1f3366871e5..09b4db117e0d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -2475,14 +2475,12 @@  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;
@@ -2492,7 +2490,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);
 	}