Merge "cnss2: Always use firmware_request_nowarn() to load binaries"

This commit is contained in:
qctecmdr 2021-03-31 06:29:05 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2ae82f3bb1
3 changed files with 6 additions and 6 deletions

View file

@ -2504,8 +2504,8 @@ int cnss_request_firmware_direct(struct cnss_plat_data *plat_priv,
return request_firmware_direct(fw_entry, filename,
&plat_priv->plat_dev->dev);
else
return request_firmware(fw_entry, filename,
&plat_priv->plat_dev->dev);
return firmware_request_nowarn(fw_entry, filename,
&plat_priv->plat_dev->dev);
}
#if IS_ENABLED(CONFIG_INTERCONNECT)

View file

@ -3931,8 +3931,8 @@ int cnss_pci_load_m3(struct cnss_pci_data *pci_priv)
cnss_pci_add_fw_prefix_name(pci_priv, filename,
DEFAULT_M3_FILE_NAME);
ret = request_firmware(&fw_entry, filename,
&pci_priv->pci_dev->dev);
ret = firmware_request_nowarn(&fw_entry, filename,
&pci_priv->pci_dev->dev);
if (ret) {
cnss_pr_err("Failed to load M3 image: %s\n", filename);
return ret;

View file

@ -606,8 +606,8 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv,
ret = cnss_request_firmware_direct(plat_priv, &fw_entry,
filename);
else
ret = request_firmware(&fw_entry, filename,
&plat_priv->plat_dev->dev);
ret = firmware_request_nowarn(&fw_entry, filename,
&plat_priv->plat_dev->dev);
if (ret) {
cnss_pr_err("Failed to load BDF: %s\n", filename);