diff mbox series

soc: qcom: smem: use correct format characters

Message ID 20220316213118.2352683-1-morbo@google.com
State Superseded
Headers show
Series soc: qcom: smem: use correct format characters | expand

Commit Message

Bill Wendling March 16, 2022, 9:31 p.m. UTC
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 <morbo@google.com>
---
 drivers/soc/qcom/smem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Nathan Chancellor March 18, 2022, 6:02 p.m. UTC | #1
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 <morbo@google.com>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  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
> 
>
Bill Wendling March 18, 2022, 6:27 p.m. UTC | #2
On Fri, Mar 18, 2022 at 11:02 AM Nathan Chancellor <nathan@kernel.org> 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 <morbo@google.com>
>
> Reviewed-by: Nathan Chancellor <nathan@kernel.org>
>
> > ---
> >  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
> >
> >
Bjorn Andersson March 21, 2022, 3:24 p.m. UTC | #3
On Fri 18 Mar 13:27 CDT 2022, Bill Wendling wrote:

> On Fri, Mar 18, 2022 at 11:02 AM Nathan Chancellor <nathan@kernel.org> 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 <morbo@google.com>
> >
> > Reviewed-by: Nathan Chancellor <nathan@kernel.org>
> >
> > > ---
> > >  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
> > >
> > >
diff mbox series

Patch

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;
 		}