Skip to content

Commit 5a2a19b

Browse files
KatrinJoalexdeucher
authored andcommitted
drm/amdgpu: remove redundant NULL check
release_firmware() checks whether firmware pointer is NULL. Remove the redundant NULL check in psp_sw_fini(). Signed-off-by: Yushan Zhou <[email protected]> Reviewed-by: Luben Tuikov <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent 65009bf commit 5a2a19b

File tree

1 file changed

+16
-20
lines changed

1 file changed

+16
-20
lines changed

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -513,26 +513,22 @@ static int psp_sw_fini(void *handle)
513513
struct psp_gfx_cmd_resp *cmd = psp->cmd;
514514

515515
psp_memory_training_fini(psp);
516-
if (psp->sos_fw) {
517-
release_firmware(psp->sos_fw);
518-
psp->sos_fw = NULL;
519-
}
520-
if (psp->asd_fw) {
521-
release_firmware(psp->asd_fw);
522-
psp->asd_fw = NULL;
523-
}
524-
if (psp->ta_fw) {
525-
release_firmware(psp->ta_fw);
526-
psp->ta_fw = NULL;
527-
}
528-
if (psp->cap_fw) {
529-
release_firmware(psp->cap_fw);
530-
psp->cap_fw = NULL;
531-
}
532-
if (psp->toc_fw) {
533-
release_firmware(psp->toc_fw);
534-
psp->toc_fw = NULL;
535-
}
516+
517+
release_firmware(psp->sos_fw);
518+
psp->sos_fw = NULL;
519+
520+
release_firmware(psp->asd_fw);
521+
psp->asd_fw = NULL;
522+
523+
release_firmware(psp->ta_fw);
524+
psp->ta_fw = NULL;
525+
526+
release_firmware(psp->cap_fw);
527+
psp->cap_fw = NULL;
528+
529+
release_firmware(psp->toc_fw);
530+
psp->toc_fw = NULL;
531+
536532
if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) ||
537533
adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7))
538534
psp_sysfs_fini(adev);

0 commit comments

Comments
 (0)