You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
59 lines
2.4 KiB
Diff
59 lines
2.4 KiB
Diff
From 7af496b9eb0433bc4cb478c9a46f85509cdb5541 Mon Sep 17 00:00:00 2001
|
|
From: zhengbin <zhengbin13@huawei.com>
|
|
Date: Sat, 16 Nov 2019 15:22:47 +0800
|
|
Subject: [PATCH] brcmfmac: remove set but not used variable
|
|
'mpnum','nsp','nmp'
|
|
|
|
Fixes gcc '-Wunused-but-set-variable' warning:
|
|
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_get_regaddr:
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:790:5: warning: variable mpnum set but not used [-Wunused-but-set-variable]
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_erom_scan:
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:866:10: warning: variable nsp set but not used [-Wunused-but-set-variable]
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_erom_scan:
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:866:5: warning: variable nmp set but not used [-Wunused-but-set-variable]
|
|
|
|
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
Signed-off-by: zhengbin <zhengbin13@huawei.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 6 +-----
|
|
1 file changed, 1 insertion(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
|
|
@@ -778,7 +778,6 @@ static int brcmf_chip_dmp_get_regaddr(st
|
|
{
|
|
u8 desc;
|
|
u32 val, szdesc;
|
|
- u8 mpnum = 0;
|
|
u8 stype, sztype, wraptype;
|
|
|
|
*regbase = 0;
|
|
@@ -786,7 +785,6 @@ static int brcmf_chip_dmp_get_regaddr(st
|
|
|
|
val = brcmf_chip_dmp_get_desc(ci, eromaddr, &desc);
|
|
if (desc == DMP_DESC_MASTER_PORT) {
|
|
- mpnum = (val & DMP_MASTER_PORT_NUM) >> DMP_MASTER_PORT_NUM_S;
|
|
wraptype = DMP_SLAVE_TYPE_MWRAP;
|
|
} else if (desc == DMP_DESC_ADDRESS) {
|
|
/* revert erom address */
|
|
@@ -854,7 +852,7 @@ int brcmf_chip_dmp_erom_scan(struct brcm
|
|
u8 desc_type = 0;
|
|
u32 val;
|
|
u16 id;
|
|
- u8 nmp, nsp, nmw, nsw, rev;
|
|
+ u8 nmw, nsw, rev;
|
|
u32 base, wrap;
|
|
int err;
|
|
|
|
@@ -880,8 +878,6 @@ int brcmf_chip_dmp_erom_scan(struct brcm
|
|
return -EFAULT;
|
|
|
|
/* only look at cores with master port(s) */
|
|
- nmp = (val & DMP_COMP_NUM_MPORT) >> DMP_COMP_NUM_MPORT_S;
|
|
- nsp = (val & DMP_COMP_NUM_SPORT) >> DMP_COMP_NUM_SPORT_S;
|
|
nmw = (val & DMP_COMP_NUM_MWRAP) >> DMP_COMP_NUM_MWRAP_S;
|
|
nsw = (val & DMP_COMP_NUM_SWRAP) >> DMP_COMP_NUM_SWRAP_S;
|
|
rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S;
|