2018-01-23 17:08:49

by Gustavo A. R. Silva

Subject: [PATCH] drm/etnaviv: fix '%x' warning

Fix the following warning by using %zx instead of %x for variable of
type size_t:

warning: format ‘%x’ expects argument of type ‘unsigned int’, but
argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]

Fixes: 50073cf98d16 ("drm/etnaviv: mmu: stop using iommu map/unmap functions")
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
This code was compiled with GCC 7.2.0

drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
index d113fe0..49e0497 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
@@ -29,7 +29,7 @@ static void etnaviv_domain_unmap(struct etnaviv_iommu_domain *domain,
size_t pgsize = SZ_4K;

if (!IS_ALIGNED(iova | size, pgsize)) {
- pr_err("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%x\n",
+ pr_err("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%zx\n",
iova, size, pgsize);
return;
}
@@ -54,7 +54,7 @@ static int etnaviv_domain_map(struct etnaviv_iommu_domain *domain,
int ret = 0;

if (!IS_ALIGNED(iova | paddr | size, pgsize)) {
- pr_err("unaligned: iova 0x%lx pa %pa size 0x%zx min_pagesz 0x%x\n",
+ pr_err("unaligned: iova 0x%lx pa %pa size 0x%zx min_pagesz 0x%zx\n",
iova, &paddr, size, pgsize);
return -EINVAL;
}
--
2.7.4

2018-01-24 11:58:38

by Lucas Stach

Subject: Re: [PATCH] drm/etnaviv: fix '%x' warning

Hi Gustavo,

Am Dienstag, den 23.01.2018, 11:07 -0600 schrieb Gustavo A. R. Silva:
> Fix the following warning by using %zx instead of %x for variable of
> type size_t:
>
> warning: format ‘%x’ expects argument of type ‘unsigned int’, but
> argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
>
> Fixes: 50073cf98d16 ("drm/etnaviv: mmu: stop using iommu map/unmap functions")
> Signed-off-by: Gustavo A. R. Silva <[email protected]>

Thanks for the patch, but I already have an equivalent change queued up.

Regards,
Lucas

> ---
> This code was compiled with GCC 7.2.0
>
>  drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
> index d113fe0..49e0497 100644
> --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
> +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
> @@ -29,7 +29,7 @@ static void etnaviv_domain_unmap(struct etnaviv_iommu_domain *domain,
> >   size_t pgsize = SZ_4K;
>  
> >   if (!IS_ALIGNED(iova | size, pgsize)) {
> > - pr_err("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%x\n",
> > + pr_err("unaligned: iova 0x%lx size 0x%zx min_pagesz 0x%zx\n",
> >          iova, size, pgsize);
> >   return;
> >   }
> @@ -54,7 +54,7 @@ static int etnaviv_domain_map(struct etnaviv_iommu_domain *domain,
> >   int ret = 0;
>  
> >   if (!IS_ALIGNED(iova | paddr | size, pgsize)) {
> > - pr_err("unaligned: iova 0x%lx pa %pa size 0x%zx min_pagesz 0x%x\n",
> > + pr_err("unaligned: iova 0x%lx pa %pa size 0x%zx min_pagesz 0x%zx\n",
> >          iova, &paddr, size, pgsize);
> >   return -EINVAL;
> >   }

2018-01-24 19:40:40

by Gustavo A. R. Silva

Subject: Re: [PATCH] drm/etnaviv: fix '%x' warning

Hello Lucas,

Quoting Lucas Stach <[email protected]>:

> Hi Gustavo,
>
> Am Dienstag, den 23.01.2018, 11:07 -0600 schrieb Gustavo A. R. Silva:
>> Fix the following warning by using %zx instead of %x for variable of
>> type size_t:
>>
>> warning: format ‘%x’ expects argument of type ‘unsigned int’, but
>> argument 4 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
>>
>> Fixes: 50073cf98d16 ("drm/etnaviv: mmu: stop using iommu map/unmap
>> functions")
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>
> Thanks for the patch, but I already have an equivalent change queued up.
>

That's great. I'm glad it is already fixed.

Thanks
--
Gustavo