From f06b30883e34fc0bbbc0764acbcbfa9002c543ac Mon Sep 17 00:00:00 2001 From: Yue Ma Date: Mon, 29 Mar 2021 15:01:14 -0700 Subject: [PATCH] cnss2: Always use firmware_request_nowarn() to load binaries The sysfs fallback mechanism is enabled if direct filesystem lookup fails, so always use firmware_request_nowarn() instead of request_firmware() to avoid unnecessary warning logs. Driver will only check for return code of the API. Change-Id: I3bdbd23d6e23384bfcb7dc2fa32712fc5af79d03 Signed-off-by: Yue Ma --- drivers/net/wireless/cnss2/main.c | 4 ++-- drivers/net/wireless/cnss2/pci.c | 4 ++-- drivers/net/wireless/cnss2/qmi.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/wireless/cnss2/main.c b/drivers/net/wireless/cnss2/main.c index 9294845ebf4a..a96011ddd7c4 100644 --- a/drivers/net/wireless/cnss2/main.c +++ b/drivers/net/wireless/cnss2/main.c @@ -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) diff --git a/drivers/net/wireless/cnss2/pci.c b/drivers/net/wireless/cnss2/pci.c index efb70ef0ae11..8d9c5380cc44 100644 --- a/drivers/net/wireless/cnss2/pci.c +++ b/drivers/net/wireless/cnss2/pci.c @@ -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; diff --git a/drivers/net/wireless/cnss2/qmi.c b/drivers/net/wireless/cnss2/qmi.c index a81967ae499c..07e6d9227f4d 100644 --- a/drivers/net/wireless/cnss2/qmi.c +++ b/drivers/net/wireless/cnss2/qmi.c @@ -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);