mac80211: backport "brcmfmac: cleanup and some rework" from 4.17
[oweals/openwrt.git] / package / kernel / mac80211 / patches / 314-v4.16-0002-brcmfmac-Rename-buscore-to-core-for-consistency.patch
1 From dbda7dacb79a377e8ed9d38ce0e4a58b70aa9060 Mon Sep 17 00:00:00 2001
2 From: Arend Van Spriel <arend.vanspriel@broadcom.com>
3 Date: Tue, 19 Dec 2017 13:47:08 +0100
4 Subject: [PATCH] brcmfmac: Rename buscore to core for consistency
5
6 Avoid confusion with unrelated _buscore labels.
7
8 Signed-off-by: Ian Molton <ian@mnementh.co.uk>
9 Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
10 [arend: only do the rename]
11 Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
12 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
13 ---
14  drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++--
15  1 file changed, 2 insertions(+), 2 deletions(-)
16
17 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
18 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
19 @@ -2485,12 +2485,12 @@ static inline void brcmf_sdio_clrintr(st
20  
21  static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)
22  {
23 -       struct brcmf_core *buscore = bus->sdio_core;
24 +       struct brcmf_core *core = bus->sdio_core;
25         u32 addr;
26         unsigned long val;
27         int ret;
28  
29 -       addr = buscore->base + SD_REG(intstatus);
30 +       addr = core->base + SD_REG(intstatus);
31  
32         val = brcmf_sdiod_readl(bus->sdiodev, addr, &ret);
33         bus->sdcnt.f1regdata++;