2022-03-17 05:07:13

by Bill Wendling

[permalink] [raw]
Subject: [PATCH] soc: qcom: smem: use correct format characters

When compiling with -Wformat, clang emits the following warnings:

drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
short' but the argument has type 'unsigned int' [-Wformat]
dev_err(smem->dev, "bad host %hu\n", remote_host);
~~~ ^~~~~~~~~~~
%u
./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
_p_func(dev, fmt, ##__VA_ARGS__); \
~~~ ^~~~~~~~~~~
drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
short' but the argument has type 'unsigned int' [-Wformat]
dev_err(smem->dev, "duplicate host %hu\n", remote_host);
~~~ ^~~~~~~~~~~
%u
./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
_p_func(dev, fmt, ##__VA_ARGS__); \
~~~ ^~~~~~~~~~~

The types of these arguments are unconditionally defined, so this patch
updates the format character to the correct ones for ints and unsigned
ints.

Link: ClangBuiltLinux/linux#378
Signed-off-by: Bill Wendling <[email protected]>
---
drivers/soc/qcom/smem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index e2057d8f1eff..a98b5f395d15 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
continue;

if (remote_host >= SMEM_HOST_COUNT) {
- dev_err(smem->dev, "bad host %hu\n", remote_host);
+ dev_err(smem->dev, "bad host %u\n", remote_host);
return -EINVAL;
}

if (smem->partitions[remote_host]) {
- dev_err(smem->dev, "duplicate host %hu\n", remote_host);
+ dev_err(smem->dev, "duplicate host %u\n", remote_host);
return -EINVAL;
}

--
2.35.1.723.g4982287a31-goog


2022-03-20 16:29:25

by Nathan Chancellor

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

On Wed, Mar 16, 2022 at 02:31:18PM -0700, Bill Wendling wrote:
> When compiling with -Wformat, clang emits the following warnings:
>
> drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
> short' but the argument has type 'unsigned int' [-Wformat]
> dev_err(smem->dev, "bad host %hu\n", remote_host);
> ~~~ ^~~~~~~~~~~
> %u
> ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> ~~~ ^~~~~~~~~~~
> ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> _p_func(dev, fmt, ##__VA_ARGS__); \
> ~~~ ^~~~~~~~~~~
> drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
> short' but the argument has type 'unsigned int' [-Wformat]
> dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> ~~~ ^~~~~~~~~~~
> %u
> ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> ~~~ ^~~~~~~~~~~
> ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> _p_func(dev, fmt, ##__VA_ARGS__); \
> ~~~ ^~~~~~~~~~~
>
> The types of these arguments are unconditionally defined, so this patch
> updates the format character to the correct ones for ints and unsigned
> ints.

Right. Alternatively, remote_host could be turned into a u16 to match
host0 and host1, as those are the only values that will ever be assigned
to it, which should have been done in commit 13a920ae7898 ("soc: qcom:
smem: a few last cleanups") to avoid introducing this warning in the
first place.

Probably does not matter though, unless the maintainers feel that is a
better fix.

> Link: ClangBuiltLinux/linux#378

Link: https://github.com/ClangBuiltLinux/linux/issues/378

as discussed on other patches :)

> Signed-off-by: Bill Wendling <[email protected]>

Reviewed-by: Nathan Chancellor <[email protected]>

> ---
> drivers/soc/qcom/smem.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> index e2057d8f1eff..a98b5f395d15 100644
> --- a/drivers/soc/qcom/smem.c
> +++ b/drivers/soc/qcom/smem.c
> @@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> continue;
>
> if (remote_host >= SMEM_HOST_COUNT) {
> - dev_err(smem->dev, "bad host %hu\n", remote_host);
> + dev_err(smem->dev, "bad host %u\n", remote_host);
> return -EINVAL;
> }
>
> if (smem->partitions[remote_host]) {
> - dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> + dev_err(smem->dev, "duplicate host %u\n", remote_host);
> return -EINVAL;
> }
>
> --
> 2.35.1.723.g4982287a31-goog
>
>

2022-03-21 16:21:11

by Bill Wendling

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

On Fri, Mar 18, 2022 at 11:02 AM Nathan Chancellor <[email protected]> wrote:
>
> On Wed, Mar 16, 2022 at 02:31:18PM -0700, Bill Wendling wrote:
> > When compiling with -Wformat, clang emits the following warnings:
> >
> > drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
> > short' but the argument has type 'unsigned int' [-Wformat]
> > dev_err(smem->dev, "bad host %hu\n", remote_host);
> > ~~~ ^~~~~~~~~~~
> > %u
> > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > ~~~ ^~~~~~~~~~~
> > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > _p_func(dev, fmt, ##__VA_ARGS__); \
> > ~~~ ^~~~~~~~~~~
> > drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
> > short' but the argument has type 'unsigned int' [-Wformat]
> > dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > ~~~ ^~~~~~~~~~~
> > %u
> > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > ~~~ ^~~~~~~~~~~
> > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > _p_func(dev, fmt, ##__VA_ARGS__); \
> > ~~~ ^~~~~~~~~~~
> >
> > The types of these arguments are unconditionally defined, so this patch
> > updates the format character to the correct ones for ints and unsigned
> > ints.
>
> Right. Alternatively, remote_host could be turned into a u16 to match
> host0 and host1, as those are the only values that will ever be assigned
> to it, which should have been done in commit 13a920ae7898 ("soc: qcom:
> smem: a few last cleanups") to avoid introducing this warning in the
> first place.
>
I'll be happy to redo the patch if the maintainers wish. :-)

> Probably does not matter though, unless the maintainers feel that is a
> better fix.
>
> > Link: ClangBuiltLinux/linux#378
>
> Link: https://github.com/ClangBuiltLinux/linux/issues/378
>
> as discussed on other patches :)
>
Thanks! Copy-and-paste strikes again...

-bw

> > Signed-off-by: Bill Wendling <[email protected]>
>
> Reviewed-by: Nathan Chancellor <[email protected]>
>
> > ---
> > drivers/soc/qcom/smem.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> > index e2057d8f1eff..a98b5f395d15 100644
> > --- a/drivers/soc/qcom/smem.c
> > +++ b/drivers/soc/qcom/smem.c
> > @@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> > continue;
> >
> > if (remote_host >= SMEM_HOST_COUNT) {
> > - dev_err(smem->dev, "bad host %hu\n", remote_host);
> > + dev_err(smem->dev, "bad host %u\n", remote_host);
> > return -EINVAL;
> > }
> >
> > if (smem->partitions[remote_host]) {
> > - dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > + dev_err(smem->dev, "duplicate host %u\n", remote_host);
> > return -EINVAL;
> > }
> >
> > --
> > 2.35.1.723.g4982287a31-goog
> >
> >

2022-03-21 22:32:51

by Bjorn Andersson

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

On Fri 18 Mar 13:27 CDT 2022, Bill Wendling wrote:

> On Fri, Mar 18, 2022 at 11:02 AM Nathan Chancellor <[email protected]> wrote:
> >
> > On Wed, Mar 16, 2022 at 02:31:18PM -0700, Bill Wendling wrote:
> > > When compiling with -Wformat, clang emits the following warnings:
> > >
> > > drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
> > > short' but the argument has type 'unsigned int' [-Wformat]
> > > dev_err(smem->dev, "bad host %hu\n", remote_host);
> > > ~~~ ^~~~~~~~~~~
> > > %u
> > > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > > ~~~ ^~~~~~~~~~~
> > > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > > _p_func(dev, fmt, ##__VA_ARGS__); \
> > > ~~~ ^~~~~~~~~~~
> > > drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
> > > short' but the argument has type 'unsigned int' [-Wformat]
> > > dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > > ~~~ ^~~~~~~~~~~
> > > %u
> > > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > > ~~~ ^~~~~~~~~~~
> > > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > > _p_func(dev, fmt, ##__VA_ARGS__); \
> > > ~~~ ^~~~~~~~~~~
> > >
> > > The types of these arguments are unconditionally defined, so this patch
> > > updates the format character to the correct ones for ints and unsigned
> > > ints.
> >
> > Right. Alternatively, remote_host could be turned into a u16 to match
> > host0 and host1, as those are the only values that will ever be assigned
> > to it, which should have been done in commit 13a920ae7898 ("soc: qcom:
> > smem: a few last cleanups") to avoid introducing this warning in the
> > first place.
> >
> I'll be happy to redo the patch if the maintainers wish. :-)
>

Forgive me, but I think that not mixing the unsigned int and u16 would
look better. So if you're willing to respin this to change the type of
remote_host, I'd be happy to merge that.

Thanks,
Bjorn

> > Probably does not matter though, unless the maintainers feel that is a
> > better fix.
> >
> > > Link: ClangBuiltLinux/linux#378
> >
> > Link: https://github.com/ClangBuiltLinux/linux/issues/378
> >
> > as discussed on other patches :)
> >
> Thanks! Copy-and-paste strikes again...
>
> -bw
>
> > > Signed-off-by: Bill Wendling <[email protected]>
> >
> > Reviewed-by: Nathan Chancellor <[email protected]>
> >
> > > ---
> > > drivers/soc/qcom/smem.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> > > index e2057d8f1eff..a98b5f395d15 100644
> > > --- a/drivers/soc/qcom/smem.c
> > > +++ b/drivers/soc/qcom/smem.c
> > > @@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> > > continue;
> > >
> > > if (remote_host >= SMEM_HOST_COUNT) {
> > > - dev_err(smem->dev, "bad host %hu\n", remote_host);
> > > + dev_err(smem->dev, "bad host %u\n", remote_host);
> > > return -EINVAL;
> > > }
> > >
> > > if (smem->partitions[remote_host]) {
> > > - dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > > + dev_err(smem->dev, "duplicate host %u\n", remote_host);
> > > return -EINVAL;
> > > }
> > >
> > > --
> > > 2.35.1.723.g4982287a31-goog
> > >
> > >

2022-03-21 23:04:18

by Bill Wendling

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

On Mon, Mar 21, 2022 at 8:24 AM Bjorn Andersson
<[email protected]> wrote:
>
> On Fri 18 Mar 13:27 CDT 2022, Bill Wendling wrote:
>
> > On Fri, Mar 18, 2022 at 11:02 AM Nathan Chancellor <[email protected]> wrote:
> > >
> > > On Wed, Mar 16, 2022 at 02:31:18PM -0700, Bill Wendling wrote:
> > > > When compiling with -Wformat, clang emits the following warnings:
> > > >
> > > > drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
> > > > short' but the argument has type 'unsigned int' [-Wformat]
> > > > dev_err(smem->dev, "bad host %hu\n", remote_host);
> > > > ~~~ ^~~~~~~~~~~
> > > > %u
> > > > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > > > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > > > ~~~ ^~~~~~~~~~~
> > > > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > > > _p_func(dev, fmt, ##__VA_ARGS__); \
> > > > ~~~ ^~~~~~~~~~~
> > > > drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
> > > > short' but the argument has type 'unsigned int' [-Wformat]
> > > > dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > > > ~~~ ^~~~~~~~~~~
> > > > %u
> > > > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > > > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > > > ~~~ ^~~~~~~~~~~
> > > > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > > > _p_func(dev, fmt, ##__VA_ARGS__); \
> > > > ~~~ ^~~~~~~~~~~
> > > >
> > > > The types of these arguments are unconditionally defined, so this patch
> > > > updates the format character to the correct ones for ints and unsigned
> > > > ints.
> > >
> > > Right. Alternatively, remote_host could be turned into a u16 to match
> > > host0 and host1, as those are the only values that will ever be assigned
> > > to it, which should have been done in commit 13a920ae7898 ("soc: qcom:
> > > smem: a few last cleanups") to avoid introducing this warning in the
> > > first place.
> > >
> > I'll be happy to redo the patch if the maintainers wish. :-)
> >
>
> Forgive me, but I think that not mixing the unsigned int and u16 would
> look better. So if you're willing to respin this to change the type of
> remote_host, I'd be happy to merge that.
>
Happy to do so! I sent out v2 of this patch. (I didn't mark it as
"PATCH v2" because I forgot about that. Sorry. :-( ).

-bw

2022-03-21 23:28:43

by Bill Wendling

[permalink] [raw]
Subject: [PATCH] soc: qcom: smem: use correct format characters

When compiling with -Wformat, clang emits the following warnings:

drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
short' but the argument has type 'unsigned int' [-Wformat]
dev_err(smem->dev, "bad host %hu\n", remote_host);
~~~ ^~~~~~~~~~~
%u
./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
_p_func(dev, fmt, ##__VA_ARGS__); \
~~~ ^~~~~~~~~~~
drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
short' but the argument has type 'unsigned int' [-Wformat]
dev_err(smem->dev, "duplicate host %hu\n", remote_host);
~~~ ^~~~~~~~~~~
%u
./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
~~~ ^~~~~~~~~~~
./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
_p_func(dev, fmt, ##__VA_ARGS__); \
~~~ ^~~~~~~~~~~

The types of these arguments are unconditionally defined, so this patch
updates the format character to the correct one and change type of
remote_host to "u16" to match with other types.

Link: https://github.com/ClangBuiltLinux/linux/issues/378
Signed-off-by: Bill Wendling <[email protected]>
---
drivers/soc/qcom/smem.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index e2057d8f1eff..9dd325df5682 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -819,7 +819,7 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
struct smem_partition_header *header;
struct smem_ptable_entry *entry;
struct smem_ptable *ptable;
- unsigned int remote_host;
+ u16 remote_host;
u16 host0, host1;
int i;

@@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
continue;

if (remote_host >= SMEM_HOST_COUNT) {
- dev_err(smem->dev, "bad host %hu\n", remote_host);
+ dev_err(smem->dev, "bad host %u\n", remote_host);
return -EINVAL;
}

if (smem->partitions[remote_host]) {
- dev_err(smem->dev, "duplicate host %hu\n", remote_host);
+ dev_err(smem->dev, "duplicate host %u\n", remote_host);
return -EINVAL;
}

--
2.35.1.894.gb6a874cedc-goog

2022-06-05 15:51:15

by Justin Stitt

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

On Mon, Mar 21, 2022 at 10:49:12AM -0700, Bill Wendling wrote:
> When compiling with -Wformat, clang emits the following warnings:
>
> drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
> short' but the argument has type 'unsigned int' [-Wformat]
> dev_err(smem->dev, "bad host %hu\n", remote_host);
> ~~~ ^~~~~~~~~~~
> %u
> ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> ~~~ ^~~~~~~~~~~
> ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> _p_func(dev, fmt, ##__VA_ARGS__); \
> ~~~ ^~~~~~~~~~~
> drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
> short' but the argument has type 'unsigned int' [-Wformat]
> dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> ~~~ ^~~~~~~~~~~
> %u
> ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> ~~~ ^~~~~~~~~~~
> ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> _p_func(dev, fmt, ##__VA_ARGS__); \
> ~~~ ^~~~~~~~~~~
>
> The types of these arguments are unconditionally defined, so this patch
> updates the format character to the correct one and change type of
> remote_host to "u16" to match with other types.
>

This patch LGTM and fixes -Wformat warning.

Tested-by: Justin Stitt <[email protected]>
Reviewed-by: Justin Stitt <[email protected]>

> Link: https://github.com/ClangBuiltLinux/linux/issues/378
> Signed-off-by: Bill Wendling <[email protected]>
> ---
> drivers/soc/qcom/smem.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> index e2057d8f1eff..9dd325df5682 100644
> --- a/drivers/soc/qcom/smem.c
> +++ b/drivers/soc/qcom/smem.c
> @@ -819,7 +819,7 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> struct smem_partition_header *header;
> struct smem_ptable_entry *entry;
> struct smem_ptable *ptable;
> - unsigned int remote_host;
> + u16 remote_host;
> u16 host0, host1;
> int i;
>
> @@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> continue;
>
> if (remote_host >= SMEM_HOST_COUNT) {
> - dev_err(smem->dev, "bad host %hu\n", remote_host);
> + dev_err(smem->dev, "bad host %u\n", remote_host);
> return -EINVAL;
> }
>
> if (smem->partitions[remote_host]) {
> - dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> + dev_err(smem->dev, "duplicate host %u\n", remote_host);
> return -EINVAL;
> }
>
> --
> 2.35.1.894.gb6a874cedc-goog
>
>

2022-07-01 22:24:44

by Nick Desaulniers

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

Hi Arnd,
Would you be able to merge this patch through the arm-soc tree? The
maintainers appear to be MIA here.
https://lore.kernel.org/lkml/[email protected]/

On Fri, Jun 3, 2022 at 2:03 PM Justin Stitt <[email protected]> wrote:
>
> On Mon, Mar 21, 2022 at 10:49:12AM -0700, Bill Wendling wrote:
> > When compiling with -Wformat, clang emits the following warnings:
> >
> > drivers/soc/qcom/smem.c:847:41: warning: format specifies type 'unsigned
> > short' but the argument has type 'unsigned int' [-Wformat]
> > dev_err(smem->dev, "bad host %hu\n", remote_host);
> > ~~~ ^~~~~~~~~~~
> > %u
> > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > ~~~ ^~~~~~~~~~~
> > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > _p_func(dev, fmt, ##__VA_ARGS__); \
> > ~~~ ^~~~~~~~~~~
> > drivers/soc/qcom/smem.c:852:47: warning: format specifies type 'unsigned
> > short' but the argument has type 'unsigned int' [-Wformat]
> > dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > ~~~ ^~~~~~~~~~~
> > %u
> > ./include/linux/dev_printk.h:144:65: note: expanded from macro 'dev_err'
> > dev_printk_index_wrap(_dev_err, KERN_ERR, dev, dev_fmt(fmt), ##__VA_ARGS__)
> > ~~~ ^~~~~~~~~~~
> > ./include/linux/dev_printk.h:110:23: note: expanded from macro 'dev_printk_index_wrap'
> > _p_func(dev, fmt, ##__VA_ARGS__); \
> > ~~~ ^~~~~~~~~~~
> >
> > The types of these arguments are unconditionally defined, so this patch
> > updates the format character to the correct one and change type of
> > remote_host to "u16" to match with other types.
> >
>
> This patch LGTM and fixes -Wformat warning.
>
> Tested-by: Justin Stitt <[email protected]>
> Reviewed-by: Justin Stitt <[email protected]>
>
> > Link: https://github.com/ClangBuiltLinux/linux/issues/378
> > Signed-off-by: Bill Wendling <[email protected]>
> > ---
> > drivers/soc/qcom/smem.c | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
> > index e2057d8f1eff..9dd325df5682 100644
> > --- a/drivers/soc/qcom/smem.c
> > +++ b/drivers/soc/qcom/smem.c
> > @@ -819,7 +819,7 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> > struct smem_partition_header *header;
> > struct smem_ptable_entry *entry;
> > struct smem_ptable *ptable;
> > - unsigned int remote_host;
> > + u16 remote_host;
> > u16 host0, host1;
> > int i;
> >
> > @@ -844,12 +844,12 @@ qcom_smem_enumerate_partitions(struct qcom_smem *smem, u16 local_host)
> > continue;
> >
> > if (remote_host >= SMEM_HOST_COUNT) {
> > - dev_err(smem->dev, "bad host %hu\n", remote_host);
> > + dev_err(smem->dev, "bad host %u\n", remote_host);
> > return -EINVAL;
> > }
> >
> > if (smem->partitions[remote_host]) {
> > - dev_err(smem->dev, "duplicate host %hu\n", remote_host);
> > + dev_err(smem->dev, "duplicate host %u\n", remote_host);
> > return -EINVAL;
> > }
> >
> > --
> > 2.35.1.894.gb6a874cedc-goog
> >
> >
>


--
Thanks,
~Nick Desaulniers

2022-07-04 13:22:09

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [PATCH] soc: qcom: smem: use correct format characters

On Sat, Jul 2, 2022 at 12:05 AM Nick Desaulniers
<[email protected]> wrote:
>
> Hi Arnd,
> Would you be able to merge this patch through the arm-soc tree? The
> maintainers appear to be MIA here.
> https://lore.kernel.org/lkml/[email protected]/

Applied with minor conflict resolution.

Arnd