[PATCH 9/9] brcmfmac: use request_firmware_nowait2 to load firmware without warnings

From: Andres Rodriguez
Date: Tue Apr 17 2018 - 11:33:50 EST


This reduces the unnecessary spew when trying to load optional firmware:
"Direct firmware load for ... failed with error -2"

Signed-off-by: Andres Rodriguez <andresx7@xxxxxxxxx>
---
drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
index 091b52979e03..26db3ebd52dc 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -503,8 +503,9 @@ static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx)
goto done;

fwctx->code = fw;
- ret = request_firmware_nowait(THIS_MODULE, true, fwctx->nvram_name,
- fwctx->dev, GFP_KERNEL, fwctx,
+ ret = request_firmware_nowait(THIS_MODULE, true, false,
+ fwctx->nvram_name, fwctx->dev,
+ GFP_KERNEL, fwctx,
brcmf_fw_request_nvram_done);

/* pass NULL to nvram callback for bcm47xx fallback */
@@ -547,7 +548,7 @@ int brcmf_fw_get_firmwares_pcie(struct device *dev, u16 flags,
fwctx->domain_nr = domain_nr;
fwctx->bus_nr = bus_nr;

- return request_firmware_nowait(THIS_MODULE, true, code, dev,
+ return request_firmware_nowait2(THIS_MODULE, true, false, code, dev,
GFP_KERNEL, fwctx,
brcmf_fw_request_code_done);
}
--
2.14.1