Skip to content

Commit 75e1658

Browse files
Nirmoy Dasalexdeucher
authored andcommitted
drm/amdgpu: call release_firmware() without a NULL check
The release_firmware() function is NULL tolerant so we do not need to check for NULL param before calling it. Signed-off-by: Nirmoy Das <[email protected]> Reviewed-by: Christian König <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent d69fd95 commit 75e1658

File tree

6 files changed

+14
-22
lines changed

6 files changed

+14
-22
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_device.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3380,10 +3380,8 @@ void amdgpu_device_fini(struct amdgpu_device *adev)
33803380
amdgpu_pm_sysfs_fini(adev);
33813381
amdgpu_fbdev_fini(adev);
33823382
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;
33873385
adev->accel_working = false;
33883386
/* free i2c buses */
33893387
if (!amdgpu_device_has_dc_support(adev))

drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,8 @@ static int psp_sw_fini(void *handle)
196196
adev->psp.sos_fw = NULL;
197197
release_firmware(adev->psp.asd_fw);
198198
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;
203201

204202
if (adev->asic_type == CHIP_NAVI10)
205203
psp_sysfs_fini(adev);

drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,8 @@ static void sdma_v4_0_destroy_inst_ctx(struct amdgpu_device *adev)
559559
int i;
560560

561561
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;
564564

565565
/* arcturus shares the same FW memory across
566566
all SDMA isntances */

drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1300,8 +1300,8 @@ static int sdma_v5_0_sw_fini(void *handle)
13001300
int i;
13011301

13021302
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;
13051305

13061306
amdgpu_ring_fini(&adev->sdma.instance[i].ring);
13071307
}

drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ static void sdma_v5_2_destroy_inst_ctx(struct amdgpu_device *adev)
115115
int i;
116116

117117
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;
120120

121121
if (adev->asic_type == CHIP_SIENNA_CICHLID)
122122
break;

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,15 +1318,11 @@ static int dm_sw_fini(void *handle)
13181318
adev->dm.dmub_srv = NULL;
13191319
}
13201320

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;
13251323

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;
13301326

13311327
return 0;
13321328
}

0 commit comments

Comments
 (0)