Newer
Older
if (err)
goto out;
if (rdev->ce_fw->size != ce_req_size) {
- pr_err("si_cp: Bogus length %zu in firmware \"%s\"\n",
- rdev->ce_fw->size, fw_name);
+ pr_err("si_cp: Bogus length %zu in firmware\n",
+ rdev->ce_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->ce_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
if (err)
goto out;
if (rdev->rlc_fw->size != rlc_req_size) {
- pr_err("si_rlc: Bogus length %zu in firmware \"%s\"\n",
- rdev->rlc_fw->size, fw_name);
+ pr_err("si_rlc: Bogus length %zu in firmware\n",
+ rdev->rlc_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->rlc_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
}
if ((rdev->mc_fw->size != mc_req_size) &&
(rdev->mc_fw->size != mc2_req_size)) {
- pr_err("si_mc: Bogus length %zu in firmware \"%s\"\n",
- rdev->mc_fw->size, fw_name);
+ pr_err("si_mc: Bogus length %zu in firmware\n",
+ rdev->mc_fw->size);
err = -EINVAL;
}
DRM_INFO("%s: %zu bytes\n", fw_name, rdev->mc_fw->size);
} else {
err = radeon_ucode_validate(rdev->mc_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) {
- pr_err("smc: error loading firmware \"%s\"\n", fw_name);
+ pr_err("smc: error loading firmware\n");
release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL;
err = 0;
} else if (rdev->smc_fw->size != smc_req_size) {
- pr_err("si_smc: Bogus length %zu in firmware \"%s\"\n",
- rdev->smc_fw->size, fw_name);
+ pr_err("si_smc: Bogus length %zu in firmware\n",
+ rdev->smc_fw->size);
err = -EINVAL;
}
} else {
err = radeon_ucode_validate(rdev->smc_fw);
if (err) {
- pr_err("si_cp: validation failed for firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: validation failed for firmware\n");
goto out;
} else {
new_fw++;
out:
if (err) {
if (err != -EINVAL)
- pr_err("si_cp: Failed to load firmware \"%s\"\n",
- fw_name);
+ pr_err("si_cp: Failed to load firmware\n");
release_firmware(rdev->pfp_fw);
rdev->pfp_fw = NULL;
release_firmware(rdev->me_fw);
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
diff --color -Nru a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c 2023-03-09 11:53:09.993441860 -0600
@@ -763,9 +763,6 @@
if (!fwreq)
return NULL;
- brcmf_info("using %s for chip %s\n",
- mapping_table[i].fw_base, chipname);
-
mp_path = brcmf_mp_global.firmware_path;
mp_path_len = strnlen(mp_path, BRCMF_FW_ALTPATH_LEN);
if (mp_path_len)
diff --color -Nru a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c 2023-03-09 11:53:09.993441860 -0600
@@ -1545,7 +1545,7 @@
if (err)
return err;
- brcmf_dbg(PCIE, "Download FW %s\n", devinfo->fw_name);
+ brcmf_dbg(PCIE, "Download FW\n");
memcpy_toio(devinfo->tcm + devinfo->ci->rambase,
(void *)fw->data, fw->size);
diff --color -Nru a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c
--- a/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c 2023-03-09 11:53:09.993441860 -0600
@@ -377,16 +377,16 @@
UCODE_LOADER_API_VER);
status = request_firmware(&wl->fw.fw_bin[i], fw_name, device);
if (status) {
- wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n",
- KBUILD_MODNAME, fw_name);
+ wiphy_err(wl->wiphy, "%s: fail to load firmware\n",
+ KBUILD_MODNAME);
return status;
}
sprintf(fw_name, "%s_hdr-%d.fw", brcms_firmwares[i],
UCODE_LOADER_API_VER);
status = request_firmware(&wl->fw.fw_hdr[i], fw_name, device);
if (status) {
- wiphy_err(wl->wiphy, "%s: fail to load firmware %s\n",
- KBUILD_MODNAME, fw_name);
+ wiphy_err(wl->wiphy, "%s: fail to load firmware\n",
+ KBUILD_MODNAME);
return status;
}
wl->fw.hdr_num_entries[i] =
diff --color -Nru a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2023-03-09 11:53:09.997441880 -0600
@@ -8372,8 +8372,8 @@
if (rc < 0) {
printk(KERN_ERR DRV_NAME ": "
- "%s: Firmware '%s' not available or load failed.\n",
- priv->net_dev->name, fw_name);
+ "%s: Firmware not available or load failed.\n",
+ priv->net_dev->name);
return rc;
}
IPW_DEBUG_INFO("firmware data %p size %zd\n", fw->fw_entry->data,
diff --color -Nru a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
--- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c 2023-03-09 19:21:02.780816235 -0600
@@ -3394,12 +3394,12 @@
/* ask firmware_class module to get the boot firmware off disk */
rc = request_firmware(raw, name, &priv->pci_dev->dev);
if (rc < 0) {
- IPW_ERROR("%s request_firmware failed: Reason %d\n", name, rc);
+ IPW_ERROR("request_firmware failed: Reason %d\n", rc);
return rc;
}
if ((*raw)->size < sizeof(*fw)) {
- IPW_ERROR("%s is too small (%zd)\n", name, (*raw)->size);
+ IPW_ERROR("Firmware file is too small (%zd)\n", (*raw)->size);
return -EINVAL;
}
if ((*raw)->size < sizeof(*fw) + le32_to_cpu(fw->boot_size) +
le32_to_cpu(fw->ucode_size) + le32_to_cpu(fw->fw_size)) {
- IPW_ERROR("%s is too small or corrupt (%zd)\n",
- name, (*raw)->size);
+ IPW_ERROR("Firmware file is too small or corrupt (%zd)\n",
+ (*raw)->size);
return -EINVAL;
}
- IPW_DEBUG_INFO("Read firmware '%s' image v%d.%d (%zd bytes)\n",
- name,
+ IPW_DEBUG_INFO("Read firmware image v%d.%d (%zd bytes)\n",
le32_to_cpu(fw->ver) >> 16,
le32_to_cpu(fw->ver) & 0xff,
(*raw)->size - sizeof(*fw));
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
@@ -3547,7 +3546,7 @@
/* DMA the initial boot firmware into the device */
rc = ipw_load_firmware(priv, boot_img, le32_to_cpu(fw->boot_size));
if (rc < 0) {
- IPW_ERROR("Unable to load boot firmware: %d\n", rc);
+ IPW_ERROR("Unable to load boot firmware\n");
goto error;
}
@@ -3569,7 +3568,7 @@
/* DMA the ucode into the device */
rc = ipw_load_ucode(priv, ucode_img, le32_to_cpu(fw->ucode_size));
if (rc < 0) {
- IPW_ERROR("Unable to load ucode: %d\n", rc);
+ IPW_ERROR("Unable to load ucode\n");
goto error;
}
@@ -3579,7 +3578,7 @@
/* DMA bss firmware into the device */
rc = ipw_load_firmware(priv, fw_img, le32_to_cpu(fw->fw_size));
if (rc < 0) {
- IPW_ERROR("Unable to load firmware: %d\n", rc);
+ IPW_ERROR("Unable to load firmware\n");
goto error;
}
#ifdef CONFIG_PM
@@ -11175,7 +11174,7 @@
* Also start the clocks. */
rc = ipw_load(priv);
if (rc) {
- IPW_ERROR("Unable to load firmware: %d\n", rc);
+ IPW_ERROR("Unable to load firmware\n");
return rc;
}
diff --color -Nru a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
--- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c 2023-03-09 18:19:33.326779411 -0600
@@ -1835,19 +1835,19 @@
sprintf(buf, "%s%u%s", name_pre, idx, ".ucode");
ret = request_firmware(&ucode_raw, buf, &il->pci_dev->dev);
if (ret < 0) {
- IL_ERR("%s firmware file req failed: %d\n", buf, ret);
+ IL_ERR("Firmware file req failed: %d\n", ret);
if (ret == -ENOENT)
continue;
else
goto error;
} else {
if (idx < api_max)
- IL_ERR("Loaded firmware %s, "
+ IL_ERR("Loaded firmware, "
"which is deprecated. "
- " Please use API v%u instead.\n", buf,
+ " Please use API v%u instead.\n",
api_max);
- D_INFO("Got firmware '%s' file "
- "(%zd bytes) from disk\n", buf, ucode_raw->size);
+ D_INFO("Got firmware file "
+ "(%zd bytes) from disk\n", ucode_raw->size);
break;
}
}
@@ -3692,7 +3692,7 @@
goto out_unset_hw_params;
}
- IL_INFO("Detected Intel Wireless WiFi Link %s\n", il->cfg->name);
+ IL_INFO("Detected Intel Wireless WiFi Link\n");
/***********************
* 7. Setup Services
diff --color -Nru a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c 2023-03-09 11:53:09.997441880 -0600
@@ -4684,7 +4684,7 @@
sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
- D_INFO("attempting to load firmware '%s'\n", il->firmware_name);
+ D_INFO("attempting to load firmware\n");
return request_firmware_nowait(THIS_MODULE, 1, il->firmware_name,
&il->pci_dev->dev, GFP_KERNEL, il,
if (!ucode_raw) {
if (il->fw_idx <= il->cfg->ucode_api_max)
- IL_ERR("request for firmware file '%s' failed.\n",
- il->firmware_name);
+ IL_ERR("request for firmware file failed.\n");
- D_INFO("Loaded firmware file '%s' (%zd bytes).\n", il->firmware_name,
- ucode_raw->size);
+ D_INFO("Loaded firmware file (%zd bytes).\n", ucode_raw->size);
/* Make sure that we got at least the API version number */
if (ucode_raw->size < 4) {
diff --color -Nru a/drivers/net/wireless/intel/iwlwifi/dvm/main.c b/drivers/net/wireless/intel/iwlwifi/dvm/main.c
--- a/drivers/net/wireless/intel/iwlwifi/dvm/main.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/main.c 2023-03-09 11:53:09.997441880 -0600
@@ -1248,7 +1248,7 @@
************************/
hw = iwl_alloc_all();
if (!hw) {
- pr_err("%s: Cannot allocate network device\n", trans->name);
+ pr_err("Cannot allocate network device\n");
goto out;
}
/***********************
* 2. Read REV register
***********************/
- IWL_INFO(priv, "Detected %s, REV=0x%X\n",
- priv->trans->name, priv->trans->hw_rev);
+ IWL_INFO(priv, "Detected, REV=0x%X\n", priv->trans->hw_rev);
if (iwl_trans_start_hw(priv->trans))
goto out_free_hw;
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
diff --color -Nru a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2023-03-09 11:53:09.997441880 -0600
@@ -184,27 +184,13 @@
if (drv->fw_index < cfg->ucode_api_min) {
IWL_ERR(drv, "no suitable firmware found!\n");
-
- if (cfg->ucode_api_min == cfg->ucode_api_max) {
- IWL_ERR(drv, "%s%d is required\n", cfg->fw_name_pre,
- cfg->ucode_api_max);
- } else {
- IWL_ERR(drv, "minimum version required: %s%d\n",
- cfg->fw_name_pre, cfg->ucode_api_min);
- IWL_ERR(drv, "maximum version supported: %s%d\n",
- cfg->fw_name_pre, cfg->ucode_api_max);
- }
-
- IWL_ERR(drv,
- "check git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git\n");
return -ENOENT;
}
snprintf(drv->firmware_name, sizeof(drv->firmware_name), "%s%s.ucode",
cfg->fw_name_pre, tag);
- IWL_DEBUG_FW_INFO(drv, "attempting to load firmware '%s'\n",
- drv->firmware_name);
+ IWL_DEBUG_FW_INFO(drv, "attempting to load firmware\n");
return request_firmware_nowait(THIS_MODULE, 1, drv->firmware_name,
drv->trans->dev,
diff --color -Nru a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c 2023-03-09 11:53:09.997441880 -0600
@@ -1583,13 +1583,11 @@
*/
ret = request_firmware(&fw_entry, nvm_file_name, trans->dev);
if (ret) {
- IWL_ERR(trans, "ERROR: %s isn't available %d\n",
- nvm_file_name, ret);
+ IWL_ERR(trans, "ERROR: firmware isn't available %d\n", ret);
- IWL_INFO(trans, "Loaded NVM file %s (%zu bytes)\n",
- nvm_file_name, fw_entry->size);
+ IWL_INFO(trans, "Loaded NVM file (%zu bytes)\n", fw_entry->size);
if (fw_entry->size > MAX_NVM_FILE_LEN) {
IWL_ERR(trans, "NVM file too large\n");
diff --color -Nru a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c 2023-03-09 11:53:09.997441880 -0600
@@ -1285,8 +1285,7 @@
goto out_free;
}
- IWL_INFO(mvm, "Detected %s, REV=0x%X\n",
- mvm->trans->name, mvm->trans->hw_rev);
+ IWL_INFO(mvm, "Detected, REV=0x%X\n", mvm->trans->hw_rev);
if (iwlwifi_mod_params.nvm_file)
mvm->nvm_file_name = iwlwifi_mod_params.nvm_file;
diff --color -Nru a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2023-03-09 11:48:45.000000000 -0600
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c 2023-03-09 11:53:09.997441880 -0600
@@ -2073,9 +2073,9 @@
int ret = 0;
u16 signature;
- dev_info(dev, "%s: Loading firmware %s\n", DRIVER_NAME, fw_name);
+ dev_info(dev, "%s: Loading firmware\n", DRIVER_NAME);
if (request_firmware(&fw, fw_name, &priv->udev->dev)) {
- dev_warn(dev, "request_firmware(%s) failed\n", fw_name);
+ dev_warn(dev, "request_firmware failed\n");
ret = -EAGAIN;
goto exit;
}
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
--- a/drivers/net/wireless/realtek/rtlwifi/core.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c 2023-03-09 11:53:09.997441880 -0600
@@ -83,8 +83,7 @@
err = request_firmware(&firmware,
rtlpriv->cfg->alt_fw_name,
rtlpriv->io.dev);
- pr_info("Loading alternative firmware %s\n",
- rtlpriv->cfg->alt_fw_name);
+ pr_info("Loading alternative firmware\n");
if (!err)
goto found_alt;
}
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c 2023-03-09 11:53:09.997441880 -0600
@@ -143,7 +143,7 @@
fw_name = "rtlwifi/rtl8188efw.bin";
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c 2023-03-09 11:53:09.997441880 -0600
@@ -146,7 +146,7 @@
fw_name = "rtlwifi/rtl8192cfw.bin";
rtlpriv->max_fw_size = 0x4000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c 2023-03-09 11:53:09.997441880 -0600
@@ -55,7 +55,7 @@
}
/* provide name of alternative file */
rtlpriv->cfg->alt_fw_name = "rtlwifi/rtl8192cufw.bin";
- pr_info("Loading firmware %s\n", fw_name);
+ pr_info("Loading firmware\n");
rtlpriv->max_fw_size = 0x4000;
err = request_firmware_nowait(THIS_MODULE, 1,
fw_name, rtlpriv->io.dev,
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192de/sw.c 2023-03-09 11:53:10.001441899 -0600
@@ -154,7 +154,7 @@
rtlpriv->max_fw_size = 0x8000;
pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
- pr_info("Loading firmware file %s\n", fw_name);
+ pr_info("Loading firmware file\n");
/* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192ee/sw.c 2023-03-09 11:53:10.001441899 -0600
@@ -149,7 +149,7 @@
fw_name = "rtlwifi/rtl8192eefw.bin";
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8192se/sw.c 2023-03-09 11:53:10.001441899 -0600
"Firmware callback routine entered!\n");
complete(&rtlpriv->firmware_loading_complete);
if (!firmware) {
- pr_err("Firmware %s not available\n", fw_name);
+ pr_err("Firmware not available\n");
rtlpriv->max_fw_size = 0;
return;
}
@@ -185,7 +185,7 @@
rtlpriv->max_fw_size = RTL8190_MAX_FIRMWARE_CODE_SIZE*2 +
sizeof(struct fw_hdr);
pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
- "Loading firmware %s\n", fw_name);
+ "Loading firmware\n");
/* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c 2023-03-09 11:53:10.001441899 -0600
@@ -152,7 +152,7 @@
fw_name = "rtlwifi/rtl8723fw_B.bin";
rtlpriv->max_fw_size = 0x6000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c 2023-03-09 11:53:10.001441899 -0600
@@ -156,7 +156,7 @@
}
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --color -Nru a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2022-07-31 16:03:01.000000000 -0500
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c 2023-03-09 11:53:10.001441899 -0600
@@ -185,7 +185,7 @@
rtlpriv->max_fw_size = 0x8000;
/*load normal firmware*/
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
@@ -196,7 +196,7 @@
return 1;
}
/*load wowlan firmware*/
- pr_info("Using firmware %s\n", wowlan_fw_name);
+ pr_info("Using firmware\n");
err = request_firmware_nowait(THIS_MODULE, 1,
wowlan_fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 2023-03-13 07:14:05.000000000 +0000
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c 2023-03-13 07:46:23.778827386 +0000
@@ -223,8 +223,7 @@
r = request_firmware(&fw, fw_name, adev->dev);
if (r) {
- dev_err(adev->dev, "can't load firmware \"%s\"\n",
- fw_name);
+ dev_err(adev->dev, "can't load firmware\n", fw_name);
return r;
diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c2023-03-13 07:14:05.000000000 +0000
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c 2023-03-13 07:43:14.487511703 +0000
@@ -821,8 +821,7 @@
out:
dev_err(adev->dev,
- "gfx11: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx11: Failed to load firmware\n", fw_name);
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
release_firmware(adev->gfx.me_fw);
diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c
--- a/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c2022-07-31 21:03:01.000000000 +0000
+++ b/drivers/gpu/drm/amd/amdgpu/imu_v11_0.c 2023-03-13 07:45:31.295016045 +0000
@@ -71,8 +71,7 @@
out:
if (err) {
dev_err(adev->dev,
- "gfx11: Failed to load firmware \"%s\"\n",
- fw_name);
+ "gfx11: Failed to load firmware\n");
release_firmware(adev->gfx.imu_fw);
diff -Nru --color a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c 2023-03-13 07:14:05.000000000 +0000
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c 2023-03-13 07:44:37.099211678 +0000
@@ -162,7 +162,7 @@
- DRM_ERROR("sdma_v6_0: Failed to load firmware \"%s\"\n", fw_name);
+ DRM_ERROR("sdma_v6_0: Failed to load firmware\n");
sdma_v6_0_destroy_inst_ctx(adev);
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
return err;
diff -Nru --color a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
--- a/drivers/gpu/drm/radeon/cik.c 2023-03-13 07:30:35.362282308 +0000
+++ b/drivers/gpu/drm/radeon/cik.c 2023-03-13 07:47:11.750655564 +0000
@@ -2238,8 +2238,7 @@
snprintf(fw_name, sizeof(fw_name), "radeon/%s_smc.bin", chip_name);
err = request_firmware(&rdev->smc_fw, fw_name, rdev->dev);
if (err) {
- pr_err("smc: error loading firmware \"%s\"\n",
- fw_name);
+ pr_err("smc: error loading firmware\n");
release_firmware(rdev->smc_fw);
rdev->smc_fw = NULL;
err = 0;
diff -Nru --color a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2023-03-13 07:30:35.446282020 +0000
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2023-03-13 07:48:46.790316692 +0000
@@ -1058,8 +1058,8 @@
/* load f/w */
err = ipw2100_fw_download(priv, &ipw2100_firmware);
if (err) {
- IPW_DEBUG_ERROR("%s: Error loading firmware: %d\n",
- priv->net_dev->name, err);
+ IPW_DEBUG_ERROR("%s: Error loading firmware\n",
+ priv->net_dev->name);
goto fail;
#ifndef CONFIG_PM
diff -Nru --color a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2023-03-13 07:30:35.554281653 +0000
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c 2023-03-13 07:55:50.464823615 +0000
@@ -1402,8 +1402,8 @@
if (!ucode_raw)
goto try_again;
- IWL_DEBUG_FW_INFO(drv, "Loaded firmware file '%s' (%zd bytes).\n",
- drv->firmware_name, ucode_raw->size);
+ IWL_DEBUG_FW_INFO(drv, "Loaded firmware file (%zd bytes).\n",
+ ucode_raw->size);
/* Make sure that we got at least the API version number */
if (ucode_raw->size < 4) {
@@ -1616,8 +1616,8 @@
break;
- IWL_INFO(drv, "loaded firmware version %s op_mode %s\n",
- drv->fw.fw_version, op->name);
+ IWL_INFO(drv, "loaded firmware version %s\n",
+ drv->fw.fw_version);
/* add this device to the list of devices using this op_mode */
list_add_tail(&drv->list, &op->drv);