amdgpu: avoid incorrect %hu format string

Message ID 20210322115458.3961825-1-arnd@kernel.org
State New
Headers show
Series
  • amdgpu: avoid incorrect %hu format string
Related show

Commit Message

Arnd Bergmann March 22, 2021, 11:54 a.m.
From: Arnd Bergmann <arnd@arndb.de>


clang points out that the %hu format string does not match the type
of the variables here:

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:7: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat]
                                  version_major, version_minor);
                                  ^~~~~~~~~~~~~
include/drm/drm_print.h:498:19: note: expanded from macro 'DRM_ERROR'
        __drm_err(fmt, ##__VA_ARGS__)
                  ~~~    ^~~~~~~~~~~

Change it to a regular %u, the same way a previous patch did for
another instance of the same warning.

Fixes: 0b437e64e0af ("drm/amdgpu: remove h from printk format specifier")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.29.2

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Comments

Christian König March 22, 2021, 11:58 a.m. | #1
Am 22.03.21 um 12:54 schrieb Arnd Bergmann:
> From: Arnd Bergmann <arnd@arndb.de>
>
> clang points out that the %hu format string does not match the type
> of the variables here:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:7: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat]
>                                    version_major, version_minor);
>                                    ^~~~~~~~~~~~~
> include/drm/drm_print.h:498:19: note: expanded from macro 'DRM_ERROR'
>          __drm_err(fmt, ##__VA_ARGS__)
>                    ~~~    ^~~~~~~~~~~
>
> Change it to a regular %u, the same way a previous patch did for
> another instance of the same warning.
>
> Fixes: 0b437e64e0af ("drm/amdgpu: remove h from printk format specifier")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Christian König <christian.koenig@amd.com>

> ---
>   drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> index e2ed4689118a..c6dbc0801604 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
> @@ -259,7 +259,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
>   		if ((adev->asic_type == CHIP_POLARIS10 ||
>   		     adev->asic_type == CHIP_POLARIS11) &&
>   		    (adev->uvd.fw_version < FW_1_66_16))
> -			DRM_ERROR("POLARIS10/11 UVD firmware version %hu.%hu is too old.\n",
> +			DRM_ERROR("POLARIS10/11 UVD firmware version %u.%u is too old.\n",
>   				  version_major, version_minor);
>   	} else {
>   		unsigned int enc_major, enc_minor, dec_minor;
Tom Rix March 22, 2021, 2:08 p.m. | #2
On 3/22/21 4:54 AM, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>

>

> clang points out that the %hu format string does not match the type

> of the variables here:

>

> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:7: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat]

>                                   version_major, version_minor);

>                                   ^~~~~~~~~~~~~

> include/drm/drm_print.h:498:19: note: expanded from macro 'DRM_ERROR'

>         __drm_err(fmt, ##__VA_ARGS__)

>                   ~~~    ^~~~~~~~~~~

>

> Change it to a regular %u, the same way a previous patch did for

> another instance of the same warning.


It would be good to explicitly call out the change.

ex/ do you mean mine ?

0b437e64e0af ("drm/amdgpu: remove h from printk format specifier")

This was for a different reason.

imo, you do not need to include what another patch did.

so you could also just remove this bit from the commit log.


The change itself looks good.

Reviewed-by: Tom Rix <trix@redhat.com>


>

> Fixes: 0b437e64e0af ("drm/amdgpu: remove h from printk format specifier")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

> index e2ed4689118a..c6dbc0801604 100644

> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

> @@ -259,7 +259,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)

>  		if ((adev->asic_type == CHIP_POLARIS10 ||

>  		     adev->asic_type == CHIP_POLARIS11) &&

>  		    (adev->uvd.fw_version < FW_1_66_16))

> -			DRM_ERROR("POLARIS10/11 UVD firmware version %hu.%hu is too old.\n",

> +			DRM_ERROR("POLARIS10/11 UVD firmware version %u.%u is too old.\n",

>  				  version_major, version_minor);

>  	} else {

>  		unsigned int enc_major, enc_minor, dec_minor;


_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Alex Deucher March 23, 2021, 3 p.m. | #3
Applied.  Thanks!

Alex

On Mon, Mar 22, 2021 at 7:55 AM Arnd Bergmann <arnd@kernel.org> wrote:
>

> From: Arnd Bergmann <arnd@arndb.de>

>

> clang points out that the %hu format string does not match the type

> of the variables here:

>

> drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c:263:7: warning: format specifies type 'unsigned short' but the argument has type 'unsigned int' [-Wformat]

>                                   version_major, version_minor);

>                                   ^~~~~~~~~~~~~

> include/drm/drm_print.h:498:19: note: expanded from macro 'DRM_ERROR'

>         __drm_err(fmt, ##__VA_ARGS__)

>                   ~~~    ^~~~~~~~~~~

>

> Change it to a regular %u, the same way a previous patch did for

> another instance of the same warning.

>

> Fixes: 0b437e64e0af ("drm/amdgpu: remove h from printk format specifier")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

> ---

>  drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)

>

> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

> index e2ed4689118a..c6dbc0801604 100644

> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

> @@ -259,7 +259,7 @@ int amdgpu_uvd_sw_init(struct amdgpu_device *adev)

>                 if ((adev->asic_type == CHIP_POLARIS10 ||

>                      adev->asic_type == CHIP_POLARIS11) &&

>                     (adev->uvd.fw_version < FW_1_66_16))

> -                       DRM_ERROR("POLARIS10/11 UVD firmware version %hu.%hu is too old.\n",

> +                       DRM_ERROR("POLARIS10/11 UVD firmware version %u.%u is too old.\n",

>                                   version_major, version_minor);

>         } else {

>                 unsigned int enc_major, enc_minor, dec_minor;

> --

> 2.29.2

>

> _______________________________________________

> amd-gfx mailing list

> amd-gfx@lists.freedesktop.org

> https://lists.freedesktop.org/mailman/listinfo/amd-gfx

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Patch

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
index e2ed4689118a..c6dbc0801604 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
@@ -259,7 +259,7 @@  int amdgpu_uvd_sw_init(struct amdgpu_device *adev)
 		if ((adev->asic_type == CHIP_POLARIS10 ||
 		     adev->asic_type == CHIP_POLARIS11) &&
 		    (adev->uvd.fw_version < FW_1_66_16))
-			DRM_ERROR("POLARIS10/11 UVD firmware version %hu.%hu is too old.\n",
+			DRM_ERROR("POLARIS10/11 UVD firmware version %u.%u is too old.\n",
 				  version_major, version_minor);
 	} else {
 		unsigned int enc_major, enc_minor, dec_minor;