Skip to content

Commit

Permalink
drm/amdgpu: remove redundant NULL check
Browse files Browse the repository at this point in the history
release_firmware() checks whether firmware pointer is NULL.
Remove the redundant NULL check in psp_sw_fini().

Signed-off-by: Yushan Zhou <katrinzhou@tencent.com>
Reviewed-by: Luben Tuikov <luben.tuikov@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
  • Loading branch information
Yushan Zhou authored and Alex Deucher committed Nov 29, 2022
1 parent 65009bf commit 5a2a19b
Showing 1 changed file with 16 additions and 20 deletions.
36 changes: 16 additions & 20 deletions drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,26 +513,22 @@ static int psp_sw_fini(void *handle)
struct psp_gfx_cmd_resp *cmd = psp->cmd;

psp_memory_training_fini(psp);
if (psp->sos_fw) {
release_firmware(psp->sos_fw);
psp->sos_fw = NULL;
}
if (psp->asd_fw) {
release_firmware(psp->asd_fw);
psp->asd_fw = NULL;
}
if (psp->ta_fw) {
release_firmware(psp->ta_fw);
psp->ta_fw = NULL;
}
if (psp->cap_fw) {
release_firmware(psp->cap_fw);
psp->cap_fw = NULL;
}
if (psp->toc_fw) {
release_firmware(psp->toc_fw);
psp->toc_fw = NULL;
}

release_firmware(psp->sos_fw);
psp->sos_fw = NULL;

release_firmware(psp->asd_fw);
psp->asd_fw = NULL;

release_firmware(psp->ta_fw);
psp->ta_fw = NULL;

release_firmware(psp->cap_fw);
psp->cap_fw = NULL;

release_firmware(psp->toc_fw);
psp->toc_fw = NULL;

if (adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 0) ||
adev->ip_versions[MP0_HWIP][0] == IP_VERSION(11, 0, 7))
psp_sysfs_fini(adev);
Expand Down

0 comments on commit 5a2a19b

Please sign in to comment.