Newer
Older
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
sizeof(struct fw_hdr);
pr_info("Driver for Realtek RTL8192SE/RTL8191SE\n"
- "Loading firmware %s\n", fw_name);
+ "Loading firmware \n", fw_name);
/* request fw */
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
index 7bf9f25..a2acfac 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723ae/sw.c
@@ -178,7 +178,7 @@ int rtl8723e_init_sw_vars(struct ieee80211_hw *hw)
fw_name = "rtlwifi/rtl8723fw_B.bin";
rtlpriv->max_fw_size = 0x6000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index f9d10f1..9048c51 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -182,7 +182,7 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
}
rtlpriv->max_fw_size = 0x8000;
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index d71d277..f2c70e1 100644
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -209,7 +209,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
rtlpriv->max_fw_size = 0x8000;
/*load normal firmware*/
- pr_info("Using firmware %s\n", fw_name);
+ pr_info("Using firmware \n", fw_name);
err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
rtl_fw_cb);
@@ -226,7 +226,7 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
}
}
/*load wowlan firmware*/
- pr_info("Using firmware %s\n", wowlan_fw_name);
+ pr_info("Using firmware \n", wowlan_fw_name);
err = request_firmware_nowait(THIS_MODULE, 1,
wowlan_fw_name,
rtlpriv->io.dev, GFP_KERNEL, hw,
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
diff -ru linux.orig/source/arch/x86/kernel/cpu/microcode/amd.c linux/source/arch/x86/kernel/cpu/microcode/amd.c
--- a/arch/x86/kernel/cpu/microcode/amd.c 2020-06-27 13:12:17.000000000 -0400
+++ b/arch/x86/kernel/cpu/microcode/amd.c 2020-06-27 13:21:09.792495638 -0400
@@ -756,7 +756,7 @@
snprintf(fw_name, sizeof(fw_name), "amd-ucode/microcode_amd_fam%.2xh.bin", c->x86);
if (request_firmware_direct(&fw, (const char *)fw_name, device)) {
- pr_debug("failed to load file %s\n", fw_name);
+ pr_debug("failed to load file\n", fw_name);
goto out;
}
diff -ru linux.orig/source/arch/x86/kernel/cpu/microcode/intel.c linux/source/arch/x86/kernel/cpu/microcode/intel.c
--- a/arch/x86/kernel/cpu/microcode/intel.c 2020-06-27 13:12:17.000000000 -0400
+++ b/arch/x86/kernel/cpu/microcode/intel.c 2020-06-27 13:37:05.143739228 -0400
@@ -989,7 +989,7 @@
c->x86, c->x86_model, c->x86_stepping);
if (request_firmware_direct(&firmware, name, device)) {
- pr_debug("data file %s load failed\n", name);
+ pr_debug("data file load failed\n", name);
return UCODE_NFOUND;
}
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
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
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
diff -ru a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c 2020-07-06 15:04:47.318942996 -0400
@@ -1499,14 +1499,14 @@
err = request_firmware(&adev->firmware.gpu_info_fw, fw_name, adev->dev);
if (err) {
dev_err(adev->dev,
- "Failed to load gpu_info firmware \"%s\"\n",
+ "Failed to load gpu_info firmware \n",
fw_name);
goto out;
}
err = amdgpu_ucode_validate(adev->firmware.gpu_info_fw);
if (err) {
dev_err(adev->dev,
- "Failed to validate gpu_info firmware \"%s\"\n",
+ "Failed to validate gpu_info firmware \n",
fw_name);
goto out;
}
diff -ru a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c 2020-07-06 15:07:45.178781957 -0400
@@ -70,7 +70,7 @@
r = request_firmware(&adev->vcn.fw, fw_name, adev->dev);
if (r) {
- dev_err(adev->dev, "amdgpu_vcn: Can't load firmware \"%s\"\n",
+ dev_err(adev->dev, "amdgpu_vcn: Can't load firmware \n",
fw_name);
return r;
}
diff -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c 2018-01-28 16:20:33.000000000 -0500
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c 2020-07-06 15:02:53.419019182 -0400
@@ -378,7 +378,7 @@
out:
if (err) {
- pr_err("gfx6: Failed to load firmware \"%s\"\n", fw_name);
+ pr_err("gfx6: 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 -ru a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c 2020-07-06 15:07:23.966802499 -0400
@@ -609,7 +609,7 @@
out:
if (err) {
dev_err(adev->dev,
- "gfx9: Failed to load firmware \"%s\"\n",
+ "gfx9: Failed to load firmware \n",
fw_name);
release_firmware(adev->gfx.pfp_fw);
adev->gfx.pfp_fw = NULL;
diff -ru a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c
--- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c 2020-07-06 15:02:30.263034763 -0400
@@ -145,7 +145,7 @@
out:
if (err) {
dev_err(adev->dev,
- "si_mc: Failed to load firmware \"%s\"\n",
+ "si_mc: Failed to load firmware \n",
fw_name);
release_firmware(adev->mc.fw);
adev->mc.fw = NULL;
diff -ru a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c
--- a/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v10_0.c 2020-07-06 15:06:58.862827119 -0400
@@ -128,7 +128,7 @@
out:
if (err) {
dev_err(adev->dev,
- "psp v10.0: Failed to load firmware \"%s\"\n",
+ "psp v10.0: Failed to load firmware \n",
fw_name);
release_firmware(adev->psp.asd_fw);
adev->psp.asd_fw = NULL;
diff -ru a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
--- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c 2018-01-28 16:20:33.000000000 -0500
+++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c 2020-07-06 15:07:11.678814507 -0400
@@ -151,7 +151,7 @@
out:
if (err) {
dev_err(adev->dev,
- "psp v3.1: Failed to load firmware \"%s\"\n",
+ "psp v3.1: Failed to load firmware \n",
fw_name);
release_firmware(adev->psp.sos_fw);
adev->psp.sos_fw = NULL;
diff -ru a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c 2020-07-06 15:06:45.466840398 -0400
@@ -217,7 +217,7 @@
}
out:
if (err) {
- DRM_ERROR("sdma_v4_0: Failed to load firmware \"%s\"\n", fw_name);
+ DRM_ERROR("sdma_v4_0: Failed to load firmware \n", fw_name);
for (i = 0; i < adev->sdma.num_instances; i++) {
release_firmware(adev->sdma.instance[i].fw);
adev->sdma.instance[i].fw = NULL;
diff -ru a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c 2020-07-06 15:03:44.522984911 -0400
@@ -7673,8 +7673,8 @@
out:
if (err) {
- DRM_ERROR("si_smc: Failed to load firmware. err = %d\"%s\"\n",
- err, fw_name);
+ DRM_ERROR("si_smc: Failed to load firmware. err = %d\n",
+ err);
release_firmware(adev->pm.fw);
adev->pm.fw = NULL;
}
diff -ru a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
--- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2020-07-06 14:31:51.000000000 -0400
+++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c 2020-07-06 15:09:35.178678896 -0400
@@ -8420,7 +8420,7 @@
if (rc < 0) {
printk(KERN_ERR DRV_NAME ": "
- "%s: Firmware '%s' not available or load failed.\n",
+ "%s: Firmware not available or load failed.\n",
priv->net_dev->name, fw_name);
return rc;
}