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