[PATCH] Fix warnings in amdgpu _sdma, _ucode.c

[Alex Deucher]

On Wed, May 17, 2023 at 10:27 PM Srinivasan Shanmugam
<srinivasan.shanmugam at amd.com> wrote:
>

Patch title should be prefixed with drm/amdgpu:.  With that fixed:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

> Fix below checkpatch warnings:
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> WARNING: Comparisons should place the constant on the right side of the test
> WARNING: Missing a blank line after declarations
>
> Cc: Luben Tuikov <luben.tuikov at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Cc: Christian König <christian.koenig at amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c  | 2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 5 +++--
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
> index 231ca06bc9c7..9568adaad5cb 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c
> @@ -64,7 +64,7 @@ int amdgpu_sdma_get_index_from_ring(struct amdgpu_ring *ring, uint32_t *index)
>  }
>
>  uint64_t amdgpu_sdma_get_csa_mc_addr(struct amdgpu_ring *ring,
> -                                    unsigned vmid)
> +                                    unsigned int vmid)
>  {
>         struct amdgpu_device *adev = ring->adev;
>         uint64_t csa_mc_addr;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index f76b1cb8baf8..16807ff96dc9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -748,7 +748,7 @@ static int amdgpu_ucode_init_single_fw(struct amdgpu_device *adev,
>         const struct imu_firmware_header_v1_0 *imu_hdr = NULL;
>         u8 *ucode_addr;
>
> -       if (NULL == ucode->fw)
> +       if (!ucode->fw)
>                 return 0;
>
>         ucode->mc_addr = mc_addr;
> @@ -972,7 +972,7 @@ static int amdgpu_ucode_patch_jt(struct amdgpu_firmware_info *ucode,
>         uint8_t *src_addr = NULL;
>         uint8_t *dst_addr = NULL;
>
> -       if (NULL == ucode->fw)
> +       if (!ucode->fw)
>                 return 0;
>
>         comm_hdr = (const struct common_firmware_header *)ucode->fw->data;
> @@ -1043,6 +1043,7 @@ int amdgpu_ucode_init_bo(struct amdgpu_device *adev)
>                         if (i == AMDGPU_UCODE_ID_CP_MEC1 &&
>                             adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {
>                                 const struct gfx_firmware_header_v1_0 *cp_hdr;
> +
>                                 cp_hdr = (const struct gfx_firmware_header_v1_0 *)ucode->fw->data;
>                                 amdgpu_ucode_patch_jt(ucode,  adev->firmware.fw_buf_mc + fw_offset,
>                                                     adev->firmware.fw_buf_ptr + fw_offset);
> --
> 2.25.1
>