drm/amdgpu: remove redundant NULL check
Subsystems (2)
PATCH 1/1 drm/amdgpu: remove redundant NULL check
From: Yushan Zhou <[email protected]>
release_firmware() checks whether firmware pointer is NULL. Remove the redundant NULL check in psp_sw_fini().
Signed-off-by Yushan Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 +++++++++++-------------- 1 file changed, 16 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +16 -20
@@ -484,26 +484,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);
Signature · 1 line
2.27.0
Luben Tuikov
AppliedApplied.
Thanks,
Luben
Quoted 57 lines · On 2022-11-23 02:44, [email protected] wrote:
From: Yushan Zhou <[email protected]>
release_firmware()checks whether firmware pointer is NULL. Remove the redundant NULL check inpsp_sw_fini().Signed-off-by Yushan Zhou <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 +++++++++++-------------- 1 file changed, 16 insertions(+), 20 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +16
-20@@ -484,26 +484,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);