diff mbox

[28/29] brcmfmac: Rename buscore->core for consistency

Message ID 20170717161637.4652-29-ian@mnementh.co.uk (mailing list archive)
State Changes Requested
Delegated to: Kalle Valo
Headers show

Commit Message

Ian Molton July 17, 2017, 4:16 p.m. UTC 
Avoid confusion with unrelated _buscore labels.

Signed-off-by: Ian Molton <ian@mnementh.co.uk>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

Comments

kernel test robot July 20, 2017, 7 a.m. UTC | #1 
Hi Ian,

[auto build test WARNING on wireless-drivers-next/master]
[also build test WARNING on v4.13-rc1]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Ian-Molton/brcmfmac-Fix-parameter-order-in-brcmf_sdiod_f0_writeb/20170718-123057
base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
config: x86_64-randconfig-a0-07201347 (attached as .config)
compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7
reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

All warnings (new ones prefixed by >>):

   drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function 'brcmf_sdio_intr_rstatus':
>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2470: warning: unused variable 'addr'

vim +/addr +2470 drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c

ba89bf19 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-04-27  2466  
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2467  static int brcmf_sdio_intr_rstatus(struct brcmf_sdio *bus)
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2468  {
8c62b25e drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Ian Molton     2017-07-17  2469  	struct brcmf_core *core = bus->sdio_core;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13 @2470  	u32 addr;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2471  	unsigned long val;
5cbb9c28 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Hante Meuleman 2014-03-06  2472  	int ret;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2473  
8c62b25e drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Ian Molton     2017-07-17  2474  	val = brcmf_sdiod_readl(bus->sdiodev, core->base + __sd_reg(intstatus), &ret);
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2475  	bus->sdcnt.f1regdata++;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2476  	if (ret != 0)
5cbb9c28 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Hante Meuleman 2014-03-06  2477  		return ret;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2478  
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2479  	val &= bus->hostintmask;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2480  	atomic_set(&bus->fcstate, !!(val & I_HMB_FC_STATE));
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2481  
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2482  	/* Clear interrupts */
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2483  	if (val) {
8c62b25e drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Ian Molton     2017-07-17  2484  		brcmf_sdiod_writel(bus->sdiodev, core->base + __sd_reg(intstatus),
8c62b25e drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c Ian Molton     2017-07-17  2485  					val, &ret);
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2486  		bus->sdcnt.f1regdata++;
d3928d09 drivers/net/wireless/brcm80211/brcmfmac/sdio.c          Vineet Gupta   2015-07-09  2487  		atomic_or(val, &bus->intstatus);
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2488  	}
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2489  
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2490  	return ret;
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2491  }
4531603a drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c      Franky Lin     2012-09-13  2492  

:::::: The code at line 2470 was first introduced by commit
:::::: 4531603a7acb1463ec0b466dcfedc6682e7a1718 brcmfmac: clear status for in-band interrupt in brcmf_sdbrcm_isr

:::::: TO: Franky Lin <frankyl@broadcom.com>
:::::: CC: John W. Linville <linville@tuxdriver.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
Ian Molton July 20, 2017, 5:45 p.m. UTC | #2 
On 20/07/17 08:00, kbuild test robot wrote:
> Hi Ian,
> 
> [auto build test WARNING on wireless-drivers-next/master]
> [also build test WARNING on v4.13-rc1]
> [if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
> 
> url:    https://github.com/0day-ci/linux/commits/Ian-Molton/brcmfmac-Fix-parameter-order-in-brcmf_sdiod_f0_writeb/20170718-123057
> base:   https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git master
> config: x86_64-randconfig-a0-07201347 (attached as .config)
> compiler: gcc-4.4 (Debian 4.4.7-8) 4.4.7
> reproduce:
>         # save the attached .config to linux build tree
>         make ARCH=x86_64 
> 
> All warnings (new ones prefixed by >>):
> 
>    drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c: In function 'brcmf_sdio_intr_rstatus':
>>> drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:2470: warning: unused variable 'addr'

Fixed in v3 spin of this series.
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
index 87eca68d6e4f..15f2acfc626d 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -2466,14 +2466,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;
+	struct brcmf_core *core = bus->sdio_core;
 	u32 addr;
 	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 +2481,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);
 	}