[PATCH] drm/amdgpu: Update min() to min_t() in 'amdgpu_info_ioctl'

[Alex Deucher]

On Sun, Jul 23, 2023 at 3:06 AM Srinivasan Shanmugam
<srinivasan.shanmugam at amd.com> wrote:
>
> Fixes the following:
>
> WARNING: min() should probably be min_t(size_t, size, sizeof(ip))
> +               ret = copy_to_user(out, &ip, min((size_t)size, sizeof(ip)));
>
> And other style fixes:
>
> WARNING: Prefer 'unsigned int' to bare use of 'unsigned'
> WARNING: Missing a blank line after declarations
>
> Cc: Christian König <christian.koenig at amd.com>
> Cc: Alex Deucher <alexander.deucher at amd.com>
> Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam at amd.com>

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

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 14 ++++++++------
>  1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 12f3c7ad7d04..631c5ab3f7dc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -557,6 +557,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>                         crtc = (struct drm_crtc *)minfo->crtcs[i];
>                         if (crtc && crtc->base.id == info->mode_crtc.id) {
>                                 struct amdgpu_crtc *amdgpu_crtc = to_amdgpu_crtc(crtc);
> +
>                                 ui32 = amdgpu_crtc->crtc_id;
>                                 found = 1;
>                                 break;
> @@ -575,7 +576,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>                 if (ret)
>                         return ret;
>
> -               ret = copy_to_user(out, &ip, min((size_t)size, sizeof(ip)));
> +               ret = copy_to_user(out, &ip, min_t(size_t, size, sizeof(ip)));
>                 return ret ? -EFAULT : 0;
>         }
>         case AMDGPU_INFO_HW_IP_COUNT: {
> @@ -721,17 +722,18 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>                                     ? -EFAULT : 0;
>         }
>         case AMDGPU_INFO_READ_MMR_REG: {
> -               unsigned n, alloc_size;
> +               unsigned int n, alloc_size;
>                 uint32_t *regs;
> -               unsigned se_num = (info->read_mmr_reg.instance >>
> +               unsigned int se_num = (info->read_mmr_reg.instance >>
>                                    AMDGPU_INFO_MMR_SE_INDEX_SHIFT) &
>                                   AMDGPU_INFO_MMR_SE_INDEX_MASK;
> -               unsigned sh_num = (info->read_mmr_reg.instance >>
> +               unsigned int sh_num = (info->read_mmr_reg.instance >>
>                                    AMDGPU_INFO_MMR_SH_INDEX_SHIFT) &
>                                   AMDGPU_INFO_MMR_SH_INDEX_MASK;
>
>                 /* set full masks if the userspace set all bits
> -                * in the bitfields */
> +                * in the bitfields
> +                */
>                 if (se_num == AMDGPU_INFO_MMR_SE_INDEX_MASK)
>                         se_num = 0xffffffff;
>                 else if (se_num >= AMDGPU_GFX_MAX_SE)
> @@ -896,7 +898,7 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
>                 return ret;
>         }
>         case AMDGPU_INFO_VCE_CLOCK_TABLE: {
> -               unsigned i;
> +               unsigned int i;
>                 struct drm_amdgpu_info_vce_clock_table vce_clk_table = {};
>                 struct amd_vce_state *vce_state;
>
> --
> 2.25.1
>