320-v5.0-0006-brcmfmac-Cleanup-brcmf_fw_request_done.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From 55e491edbf14b2da5419c2a319ea3b1d6368d9a2 Mon Sep 17 00:00:00 2001
  2. From: Hans de Goede <[email protected]>
  3. Date: Wed, 10 Oct 2018 13:01:03 +0200
  4. Subject: [PATCH] brcmfmac: Cleanup brcmf_fw_request_done()
  5. The "cur" variable is now only used for a debug print and we already
  6. print the same info from brcmf_fw_complete_request(), so the debug print
  7. does not provide any extra info and we can remove it.
  8. Signed-off-by: Hans de Goede <[email protected]>
  9. Signed-off-by: Kalle Valo <[email protected]>
  10. ---
  11. drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 8 +-------
  12. 1 file changed, 1 insertion(+), 7 deletions(-)
  13. --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  14. +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
  15. @@ -560,22 +560,16 @@ static int brcmf_fw_request_firmware(con
  16. static void brcmf_fw_request_done(const struct firmware *fw, void *ctx)
  17. {
  18. struct brcmf_fw *fwctx = ctx;
  19. - struct brcmf_fw_item *cur;
  20. - int ret = 0;
  21. -
  22. - cur = &fwctx->req->items[fwctx->curpos];
  23. + int ret;
  24. ret = brcmf_fw_complete_request(fw, fwctx);
  25. while (ret == 0 && ++fwctx->curpos < fwctx->req->n_items) {
  26. - cur = &fwctx->req->items[fwctx->curpos];
  27. brcmf_fw_request_firmware(&fw, fwctx);
  28. ret = brcmf_fw_complete_request(fw, ctx);
  29. }
  30. if (ret) {
  31. - brcmf_dbg(TRACE, "failed err=%d: dev=%s, fw=%s\n", ret,
  32. - dev_name(fwctx->dev), cur->path);
  33. brcmf_fw_free_request(fwctx->req);
  34. fwctx->req = NULL;
  35. }