| Message ID | 20190514173816.17030-1-f.fainelli@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2,1/2] firmware: bcm47xx_nvram: Correct size_t printf format | expand |
Hi Florian, On 5/14/19 7:38 PM, Florian Fainelli wrote: > When building on a 64-bit host, we will get warnings like those: > > drivers/firmware/broadcom/bcm47xx_nvram.c:103:3: note: in expansion of macro 'pr_err' > pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > ^~~~~~ > drivers/firmware/broadcom/bcm47xx_nvram.c:103:28: note: format string is defined here > pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > ~^ > %li > > Use %zu instead for that purpose. > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > --- > Changes in v2: > - Use %zu instead of %zi (Joe Perches) > > drivers/firmware/broadcom/bcm47xx_nvram.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c > index d25f080fcb0d..8698c5dd29d9 100644 > --- a/drivers/firmware/broadcom/bcm47xx_nvram.c > +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c > @@ -100,7 +100,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) > nvram_len = size; > } > if (nvram_len >= NVRAM_SPACE) { > - pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > + pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > nvram_len, NVRAM_SPACE - 1); Why not change the other format too, to stay consistent? > nvram_len = NVRAM_SPACE - 1; > } > @@ -152,7 +152,7 @@ static int nvram_init(void) > header.len > sizeof(header)) { > nvram_len = header.len; > if (nvram_len >= NVRAM_SPACE) { > - pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > + pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > header.len, NVRAM_SPACE); Ditto. Regardless: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > nvram_len = NVRAM_SPACE - 1; > } >
Hello, Florian Fainelli wrote: > When building on a 64-bit host, we will get warnings like those: > > drivers/firmware/broadcom/bcm47xx_nvram.c:103:3: note: in expansion of macro 'pr_err' > pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > ^~~~~~ > drivers/firmware/broadcom/bcm47xx_nvram.c:103:28: note: format string is defined here > pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", > ~^ > %li > > Use %zu instead for that purpose. Series applied to mips-next. > firmware: bcm47xx_nvram: Correct size_t printf format > commit feb4eb060c3a > https://git.kernel.org/mips/c/feb4eb060c3a > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Signed-off-by: Paul Burton <paul.burton@mips.com> > > firmware: bcm47xx_nvram: Allow COMPILE_TEST > commit 5699ad0aaf10 > https://git.kernel.org/mips/c/5699ad0aaf10 > > Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> > Signed-off-by: Paul Burton <paul.burton@mips.com> Thanks, Paul [ This message was auto-generated; if you believe anything is incorrect then please email paul.burton@mips.com to report it. ]
diff --git a/drivers/firmware/broadcom/bcm47xx_nvram.c b/drivers/firmware/broadcom/bcm47xx_nvram.c index d25f080fcb0d..8698c5dd29d9 100644 --- a/drivers/firmware/broadcom/bcm47xx_nvram.c +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c @@ -100,7 +100,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) nvram_len = size; } if (nvram_len >= NVRAM_SPACE) { - pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", + pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", nvram_len, NVRAM_SPACE - 1); nvram_len = NVRAM_SPACE - 1; } @@ -152,7 +152,7 @@ static int nvram_init(void) header.len > sizeof(header)) { nvram_len = header.len; if (nvram_len >= NVRAM_SPACE) { - pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", + pr_err("nvram on flash (%zu bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", header.len, NVRAM_SPACE); nvram_len = NVRAM_SPACE - 1; }
When building on a 64-bit host, we will get warnings like those: drivers/firmware/broadcom/bcm47xx_nvram.c:103:3: note: in expansion of macro 'pr_err' pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", ^~~~~~ drivers/firmware/broadcom/bcm47xx_nvram.c:103:28: note: format string is defined here pr_err("nvram on flash (%i bytes) is bigger than the reserved space in memory, will just copy the first %i bytes\n", ~^ %li Use %zu instead for that purpose. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> --- Changes in v2: - Use %zu instead of %zi (Joe Perches) drivers/firmware/broadcom/bcm47xx_nvram.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)