brcmfmac: don't warn user if requested nvram fails The requested nvram is optional, don't nag users about this. Additionally, the new driver data API enables us to let the API deal with the freeing of the nvram for us if we happen to free it immediately on the consumer callback, this driver does that so take advantage of this feature. Originally based on patches by Rafał Miłecki. Signed-off-by: Luis R. Rodriguez <mcgrof@kernel.org>
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index c7c1e99..d77ab26 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -17,7 +17,7 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/device.h> -#include <linux/firmware.h> +#include <linux/driver_data.h> #include <linux/module.h> #include <linux/bcm47xx_nvram.h> @@ -473,7 +473,6 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) if (raw_nvram) bcm47xx_nvram_release_contents(data); - release_firmware(fw); if (!nvram && !(fwctx->flags & BRCMF_FW_REQ_NV_OPTIONAL)) goto fail; @@ -491,6 +490,9 @@ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx) static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) { struct brcmf_fw *fwctx = ctx; + struct driver_data_req_params params = { + DRIVER_DATA_DEFAULT_ASYNC_OPT(brcmf_fw_request_nvram_done, fwctx), + }; int ret; brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(fwctx->dev)); @@ -504,10 +506,7 @@ static void brcmf_fw_request_code_done(const struct firmware *fw, void *ctx) return; } fwctx->code = fw; - ret = request_firmware_nowait(THIS_MODULE, true, fwctx->nvram_name, - fwctx->dev, GFP_KERNEL, fwctx, - brcmf_fw_request_nvram_done); - + ret = driver_data_request_async(fwctx->nvram_name, ¶ms, fwctx->dev); if (!ret) return;