File tree Expand file tree Collapse file tree 6 files changed +14
-22
lines changed Expand file tree Collapse file tree 6 files changed +14
-22
lines changed Original file line number Diff line number Diff line change @@ -3380,10 +3380,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
3380
3380
amdgpu_pm_sysfs_fini (adev );
3381
3381
amdgpu_fbdev_fini (adev );
3382
3382
r = amdgpu_device_ip_fini (adev );
3383
- if (adev -> firmware .gpu_info_fw ) {
3384
- release_firmware (adev -> firmware .gpu_info_fw );
3385
- adev -> firmware .gpu_info_fw = NULL ;
3386
- }
3383
+ release_firmware (adev -> firmware .gpu_info_fw );
3384
+ adev -> firmware .gpu_info_fw = NULL ;
3387
3385
adev -> accel_working = false;
3388
3386
/* free i2c buses */
3389
3387
if (!amdgpu_device_has_dc_support (adev ))
Original file line number Diff line number Diff line change @@ -196,10 +196,8 @@ static int psp_sw_fini(void *handle)
196
196
adev -> psp .sos_fw = NULL ;
197
197
release_firmware (adev -> psp .asd_fw );
198
198
adev -> psp .asd_fw = NULL ;
199
- if (adev -> psp .ta_fw ) {
200
- release_firmware (adev -> psp .ta_fw );
201
- adev -> psp .ta_fw = NULL ;
202
- }
199
+ release_firmware (adev -> psp .ta_fw );
200
+ adev -> psp .ta_fw = NULL ;
203
201
204
202
if (adev -> asic_type == CHIP_NAVI10 )
205
203
psp_sysfs_fini (adev );
Original file line number Diff line number Diff line change @@ -559,8 +559,8 @@ static void sdma_v4_0_destroy_inst_ctx(struct amdgpu_device *adev)
559
559
int i ;
560
560
561
561
for (i = 0 ; i < adev -> sdma .num_instances ; i ++ ) {
562
- if (adev -> sdma .instance [i ].fw != NULL )
563
- release_firmware ( adev -> sdma .instance [i ].fw ) ;
562
+ release_firmware (adev -> sdma .instance [i ].fw );
563
+ adev -> sdma .instance [i ].fw = NULL ;
564
564
565
565
/* arcturus shares the same FW memory across
566
566
all SDMA isntances */
Original file line number Diff line number Diff line change @@ -1300,8 +1300,8 @@ static int sdma_v5_0_sw_fini(void *handle)
1300
1300
int i ;
1301
1301
1302
1302
for (i = 0 ; i < adev -> sdma .num_instances ; i ++ ) {
1303
- if (adev -> sdma .instance [i ].fw != NULL )
1304
- release_firmware ( adev -> sdma .instance [i ].fw ) ;
1303
+ release_firmware (adev -> sdma .instance [i ].fw );
1304
+ adev -> sdma .instance [i ].fw = NULL ;
1305
1305
1306
1306
amdgpu_ring_fini (& adev -> sdma .instance [i ].ring );
1307
1307
}
Original file line number Diff line number Diff line change @@ -115,8 +115,8 @@ static void sdma_v5_2_destroy_inst_ctx(struct amdgpu_device *adev)
115
115
int i ;
116
116
117
117
for (i = 0 ; i < adev -> sdma .num_instances ; i ++ ) {
118
- if (adev -> sdma .instance [i ].fw != NULL )
119
- release_firmware ( adev -> sdma .instance [i ].fw ) ;
118
+ release_firmware (adev -> sdma .instance [i ].fw );
119
+ adev -> sdma .instance [i ].fw = NULL ;
120
120
121
121
if (adev -> asic_type == CHIP_SIENNA_CICHLID )
122
122
break ;
Original file line number Diff line number Diff line change @@ -1318,15 +1318,11 @@ static int dm_sw_fini(void *handle)
1318
1318
adev -> dm .dmub_srv = NULL ;
1319
1319
}
1320
1320
1321
- if (adev -> dm .dmub_fw ) {
1322
- release_firmware (adev -> dm .dmub_fw );
1323
- adev -> dm .dmub_fw = NULL ;
1324
- }
1321
+ release_firmware (adev -> dm .dmub_fw );
1322
+ adev -> dm .dmub_fw = NULL ;
1325
1323
1326
- if (adev -> dm .fw_dmcu ) {
1327
- release_firmware (adev -> dm .fw_dmcu );
1328
- adev -> dm .fw_dmcu = NULL ;
1329
- }
1324
+ release_firmware (adev -> dm .fw_dmcu );
1325
+ adev -> dm .fw_dmcu = NULL ;
1330
1326
1331
1327
return 0 ;
1332
1328
}
You can’t perform that action at this time.
0 commit comments