103-v5.5-brcmfmac-remove-set-but-not-used-variable-mpnum-nsp-.patch 2.4 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758
  1. From 7af496b9eb0433bc4cb478c9a46f85509cdb5541 Mon Sep 17 00:00:00 2001
  2. From: zhengbin <[email protected]>
  3. Date: Sat, 16 Nov 2019 15:22:47 +0800
  4. Subject: [PATCH] brcmfmac: remove set but not used variable
  5. 'mpnum','nsp','nmp'
  6. Fixes gcc '-Wunused-but-set-variable' warning:
  7. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_get_regaddr:
  8. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:790:5: warning: variable mpnum set but not used [-Wunused-but-set-variable]
  9. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_erom_scan:
  10. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:866:10: warning: variable nsp set but not used [-Wunused-but-set-variable]
  11. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c: In function brcmf_chip_dmp_erom_scan:
  12. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c:866:5: warning: variable nmp set but not used [-Wunused-but-set-variable]
  13. Reported-by: Hulk Robot <[email protected]>
  14. Signed-off-by: zhengbin <[email protected]>
  15. Signed-off-by: Kalle Valo <[email protected]>
  16. ---
  17. drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c | 6 +-----
  18. 1 file changed, 1 insertion(+), 5 deletions(-)
  19. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
  20. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
  21. @@ -778,7 +778,6 @@ static int brcmf_chip_dmp_get_regaddr(st
  22. {
  23. u8 desc;
  24. u32 val, szdesc;
  25. - u8 mpnum = 0;
  26. u8 stype, sztype, wraptype;
  27. *regbase = 0;
  28. @@ -786,7 +785,6 @@ static int brcmf_chip_dmp_get_regaddr(st
  29. val = brcmf_chip_dmp_get_desc(ci, eromaddr, &desc);
  30. if (desc == DMP_DESC_MASTER_PORT) {
  31. - mpnum = (val & DMP_MASTER_PORT_NUM) >> DMP_MASTER_PORT_NUM_S;
  32. wraptype = DMP_SLAVE_TYPE_MWRAP;
  33. } else if (desc == DMP_DESC_ADDRESS) {
  34. /* revert erom address */
  35. @@ -854,7 +852,7 @@ int brcmf_chip_dmp_erom_scan(struct brcm
  36. u8 desc_type = 0;
  37. u32 val;
  38. u16 id;
  39. - u8 nmp, nsp, nmw, nsw, rev;
  40. + u8 nmw, nsw, rev;
  41. u32 base, wrap;
  42. int err;
  43. @@ -880,8 +878,6 @@ int brcmf_chip_dmp_erom_scan(struct brcm
  44. return -EFAULT;
  45. /* only look at cores with master port(s) */
  46. - nmp = (val & DMP_COMP_NUM_MPORT) >> DMP_COMP_NUM_MPORT_S;
  47. - nsp = (val & DMP_COMP_NUM_SPORT) >> DMP_COMP_NUM_SPORT_S;
  48. nmw = (val & DMP_COMP_NUM_MWRAP) >> DMP_COMP_NUM_MWRAP_S;
  49. nsw = (val & DMP_COMP_NUM_SWRAP) >> DMP_COMP_NUM_SWRAP_S;
  50. rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S;