diff mbox

[V2,01/12] brcmfmac: do not convert linux error to firmware error string

Message ID 1521750511-12345-2-git-send-email-arend.vanspriel@broadcom.com (mailing list archive)
State Accepted
Commit 1170f6d1be6a39e1a115a2c0f50923eb4ce2a7ec
Delegated to: Kalle Valo
Headers show

Commit Message

Arend Van Spriel March 22, 2018, 8:28 p.m. UTC 
In case of a linux error brcmf_fil_cmd_data() blurts an error message
in which the error code is translated to an error string. However, it
maps it to a firmware error string which should not happen. Simply
print only the numeric error code and be done with it.

Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
Reviewed-by: Franky Lin <franky.lin@broadcom.com>
Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
---
 drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Kalle Valo March 27, 2018, 9:08 a.m. UTC | #1 
Arend Van Spriel <arend.vanspriel@broadcom.com> wrote:

> In case of a linux error brcmf_fil_cmd_data() blurts an error message
> in which the error code is translated to an error string. However, it
> maps it to a firmware error string which should not happen. Simply
> print only the numeric error code and be done with it.
> 
> Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
> Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
> Reviewed-by: Franky Lin <franky.lin@broadcom.com>
> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>

12 patches applied to wireless-drivers-next.git, thanks.

1170f6d1be6a brcmfmac: do not convert linux error to firmware error string
756a2b390874 brcmfmac: use brcmf_chip_name() to store name in revinfo
c88cfa075de3 brcmfmac: use brcmf_chip_name() for consistency
856d5a011c86 brcmfmac: allocate struct brcmf_pub instance using wiphy_new()
34789d0cf682 brcmfmac: use wiphy debugfs dir entry
41f573dbb534 brcmfmac: derive firmware filenames from basename mapping
d09ae51a4b67 brcmfmac: pass struct in brcmf_fw_get_firmwares()
2baa3aaee27f brcmfmac: introduce brcmf_fw_alloc_request() function
bf7a7b37f6ef brcmfmac: add extension to .get_fwname() callbacks
18c2b20e276e brcmfmac: get rid of brcmf_fw_map_chip_to_name()
bf291b7247e5 brcmfmac: get rid of brcmf_fw_get_full_name()
48eaee3f272a brcmfmac: add kerneldoc for struct brcmf_bus::msgbuf
diff mbox

Patch

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
index f2cfdd3..f527edc 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c
@@ -124,8 +124,7 @@  static const char *brcmf_fil_get_errstr(u32 err)
 					     data, len, &fwerr);
 
 	if (err) {
-		brcmf_dbg(FIL, "Failed: %s (%d)\n",
-			  brcmf_fil_get_errstr((u32)(-err)), err);
+		brcmf_dbg(FIL, "Failed: error=%d\n", err);
 	} else if (fwerr < 0) {
 		brcmf_dbg(FIL, "Firmware error: %s (%d)\n",
 			  brcmf_fil_get_errstr((u32)(-fwerr)), fwerr);