Re: [PATCH] drm/amdgpu: remove redundant NULL check

[Luben Tuikov]

Applied.

Thanks,
Luben

On 2022-11-23 02:44, zys.zlj...@gmail.com wrote:
> From: Yushan Zhou <katrinz...@tencent.com>
> 
> release_firmware() checks whether firmware pointer is NULL.
> Remove the redundant NULL check in psp_sw_fini().
> 
> Signed-off-by: Yushan Zhou <katrinz...@tencent.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 36 +++++++++++--------------
>  1 file changed, 16 insertions(+), 20 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c 
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index effa7df3ddbf..77b966ab5439 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -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);