Re: [PATCH] drm/amdgpu: remove h from printk format specifier

[Christian König]

Am 15.12.20 um 15:38 schrieb trix@xxxxxxxxxx:
> From: Tom Rix <trix@xxxxxxxxxx>
>
> See Documentation/core-api/printk-formats.rst.
> h should no longer be used in the format specifier for printk.

In general looks valid to me, but my question is how does that work?

I mean we specify h here because it is a short int. Are ints always 
32bit on the stack?

Thanks,
Christian.

> Signed-off-by: Tom Rix <trix@xxxxxxxxxx>
> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 4 ++--
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 2 +-
>   drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 ++--
>   3 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index 7c5b60e53482..8b989670ed66 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -240,7 +240,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
>   
>   		version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
>   		version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
> -		DRM_INFO("Found UVD firmware Version: %hu.%hu Family ID: %hu\n",
> +		DRM_INFO("Found UVD firmware Version: %u.%u Family ID: %u\n",
>   			version_major, version_minor, family_id);
>   
>   		/*
> @@ -267,7 +267,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
>   		dec_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
>   		enc_minor = (le32_to_cpu(hdr->ucode_version) >> 24) & 0x3f;
>   		enc_major = (le32_to_cpu(hdr->ucode_version) >> 30) & 0x3;
> -		DRM_INFO("Found UVD firmware ENC: %hu.%hu DEC: .%hu Family ID: %hu\n",
> +		DRM_INFO("Found UVD firmware ENC: %u.%u DEC: .%u Family ID: %u\n",
>   			enc_major, enc_minor, dec_minor, family_id);
>   
>   		adev->uvd.max_handles = AMDGPU_MAX_UVD_HANDLES;
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> index 4861f8ddc1b5..ea6a62f67e38 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
> @@ -179,7 +179,7 @@ int amdgpu_vce_sw_init(struct amdgpu_device *adev, unsigned long size)
>   	version_major = (ucode_version >> 20) & 0xfff;
>   	version_minor = (ucode_version >> 8) & 0xfff;
>   	binary_id = ucode_version & 0xff;
> -	DRM_INFO("Found VCE firmware Version: %hhd.%hhd Binary ID: %hhd\n",
> +	DRM_INFO("Found VCE firmware Version: %d.%d Binary ID: %d\n",
>   		version_major, version_minor, binary_id);
>   	adev->vce.fw_version = ((version_major << 24) | (version_minor << 16) |
>   				(binary_id << 8));
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> index 1e756186e3f8..99b82f3c2617 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
> @@ -181,7 +181,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
>   		enc_major = fw_check;
>   		dec_ver = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xf;
>   		vep = (le32_to_cpu(hdr->ucode_version) >> 28) & 0xf;
> -		DRM_INFO("Found VCN firmware Version ENC: %hu.%hu DEC: %hu VEP: %hu Revision: %hu\n",
> +		DRM_INFO("Found VCN firmware Version ENC: %u.%u DEC: %u VEP: %u Revision: %u\n",
>   			enc_major, enc_minor, dec_ver, vep, fw_rev);
>   	} else {
>   		unsigned int version_major, version_minor, family_id;
> @@ -189,7 +189,7 @@ int amdgpu_vcn_sw_init(struct amdgpu_device *adev)
>   		family_id = le32_to_cpu(hdr->ucode_version) & 0xff;
>   		version_major = (le32_to_cpu(hdr->ucode_version) >> 24) & 0xff;
>   		version_minor = (le32_to_cpu(hdr->ucode_version) >> 8) & 0xff;
> -		DRM_INFO("Found VCN firmware Version: %hu.%hu Family ID: %hu\n",
> +		DRM_INFO("Found VCN firmware Version: %u.%u Family ID: %u\n",
>   			version_major, version_minor, family_id);
>   	}
>