314-v4.16-0002-brcmfmac-Rename-buscore-to-core-for-consistency.patch 1.2 KB

123456789101112131415161718192021222324252627282930313233
  1. From dbda7dacb79a377e8ed9d38ce0e4a58b70aa9060 Mon Sep 17 00:00:00 2001
  2. From: Arend Van Spriel <[email protected]>
  3. Date: Tue, 19 Dec 2017 13:47:08 +0100
  4. Subject: [PATCH] brcmfmac: Rename buscore to core for consistency
  5. Avoid confusion with unrelated _buscore labels.
  6. Signed-off-by: Ian Molton <[email protected]>
  7. Acked-by: Arend van Spriel <[email protected]>
  8. [arend: only do the rename]
  9. Signed-off-by: Arend van Spriel <[email protected]>
  10. Signed-off-by: Kalle Valo <[email protected]>
  11. ---
  12. drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 ++--
  13. 1 file changed, 2 insertions(+), 2 deletions(-)
  14. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  15. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
  16. @@ -2485,12 +2485,12 @@ static inline void brcmf_sdio_clrintr(st
  17. static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)
  18. {
  19. - struct brcmf_core *buscore = bus->sdio_core;
  20. + struct brcmf_core *core = bus->sdio_core;
  21. u32 addr;
  22. unsigned long val;
  23. int ret;
  24. - addr = buscore->base + SD_REG(intstatus);
  25. + addr = core->base + SD_REG(intstatus);
  26. val = brcmf_sdiod_readl(bus->sdiodev, addr, &ret);
  27. bus->sdcnt.f1regdata++;