[PATCH 3/3] drm/amdgpu: Change a few function names

[Alex Deucher]

On Wed, Jul 14, 2021 at 11:25 AM Oak Zeng <Oak.Zeng at amd.com> wrote:
>
> Function name "psp_np_fw_load" is not proper as people don't
> know _np_fw_ means "non psp firmware". Change the function
> name to psp_load_non_psp_fw for better understanding. Same
> thing for function psp_execute_np_fw_load.
>
> Signed-off-by: Oak Zeng <Oak.Zeng at amd.com>

Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index d9ddb2c..8d1e2b2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -2351,7 +2351,7 @@ static int psp_prep_load_ip_fw_cmd_buf(struct amdgpu_firmware_info *ucode,
>         return ret;
>  }
>
> -static int psp_execute_np_fw_load(struct psp_context *psp,
> +static int psp_execute_non_psp_fw_load(struct psp_context *psp,
>                                   struct amdgpu_firmware_info *ucode)
>  {
>         int ret = 0;
> @@ -2387,7 +2387,7 @@ static int psp_load_smu_fw(struct psp_context *psp)
>                 }
>         }
>
> -       ret = psp_execute_np_fw_load(psp, ucode);
> +       ret = psp_execute_non_psp_fw_load(psp, ucode);
>
>         if (ret)
>                 DRM_ERROR("PSP load smu failed!\n");
> @@ -2442,14 +2442,14 @@ int psp_load_fw_list(struct psp_context *psp,
>         for (i = 0; i < ucode_count; ++i) {
>                 ucode = ucode_list[i];
>                 psp_print_fw_hdr(psp, ucode);
> -               ret = psp_execute_np_fw_load(psp, ucode);
> +               ret = psp_execute_non_psp_fw_load(psp, ucode);
>                 if (ret)
>                         return ret;
>         }
>         return ret;
>  }
>
> -static int psp_np_fw_load(struct psp_context *psp)
> +static int psp_load_non_psp_fw(struct psp_context *psp)
>  {
>         int i, ret;
>         struct amdgpu_firmware_info *ucode;
> @@ -2488,7 +2488,7 @@ static int psp_np_fw_load(struct psp_context *psp)
>
>                 psp_print_fw_hdr(psp, ucode);
>
> -               ret = psp_execute_np_fw_load(psp, ucode);
> +               ret = psp_execute_non_psp_fw_load(psp, ucode);
>                 if (ret)
>                         return ret;
>
> @@ -2565,7 +2565,7 @@ static int psp_load_fw(struct amdgpu_device *adev)
>         if (ret)
>                 goto failed;
>
> -       ret = psp_np_fw_load(psp);
> +       ret = psp_load_non_psp_fw(psp);
>         if (ret)
>                 goto failed;
>
> @@ -2765,7 +2765,7 @@ static int psp_resume(void *handle)
>         if (ret)
>                 goto failed;
>
> -       ret = psp_np_fw_load(psp);
> +       ret = psp_load_non_psp_fw(psp);
>         if (ret)
>                 goto failed;
>
> @@ -2863,7 +2863,7 @@ int psp_update_vcn_sram(struct amdgpu_device *adev, int inst_idx,
>         ucode.mc_addr = cmd_gpu_addr;
>         ucode.ucode_size = cmd_size;
>
> -       return psp_execute_np_fw_load(&adev->psp, &ucode);
> +       return psp_execute_non_psp_fw_load(&adev->psp, &ucode);
>  }
>
>  int psp_ring_cmd_submit(struct psp_context *psp,
> --
> 2.7.4
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx