* [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format
@ 2019-05-14 17:38 Florian Fainelli
2019-05-14 17:38 ` [PATCH v2 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Florian Fainelli @ 2019-05-14 17:38 UTC (permalink / raw)
To: linux-mips
Cc: joe, Florian Fainelli, Rafał Miłecki,
open list:BROADCOM NVRAM DRIVER, open list
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);
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;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST
2019-05-14 17:38 [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
@ 2019-05-14 17:38 ` Florian Fainelli
2019-05-15 5:17 ` [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Philippe Mathieu-Daudé
2019-08-26 11:04 ` Paul Burton
2 siblings, 0 replies; 4+ messages in thread
From: Florian Fainelli @ 2019-05-14 17:38 UTC (permalink / raw)
To: linux-mips
Cc: joe, Florian Fainelli, Rafał Miłecki,
open list:BROADCOM NVRAM DRIVER, open list
Allow building building the BCM47xx NVRAM and SPROM drivers using
COMPILE_TEST.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/firmware/broadcom/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/firmware/broadcom/Kconfig b/drivers/firmware/broadcom/Kconfig
index f77cdb3a041f..c041dcb7ea52 100644
--- a/drivers/firmware/broadcom/Kconfig
+++ b/drivers/firmware/broadcom/Kconfig
@@ -1,6 +1,6 @@
config BCM47XX_NVRAM
bool "Broadcom NVRAM driver"
- depends on BCM47XX || ARCH_BCM_5301X
+ depends on BCM47XX || ARCH_BCM_5301X || COMPILE_TEST
help
Broadcom home routers contain flash partition called "nvram" with all
important hardware configuration as well as some minor user setup.
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format
2019-05-14 17:38 [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
2019-05-14 17:38 ` [PATCH v2 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
@ 2019-05-15 5:17 ` Philippe Mathieu-Daudé
2019-08-26 11:04 ` Paul Burton
2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-05-15 5:17 UTC (permalink / raw)
To: Florian Fainelli, linux-mips
Cc: joe, Rafał Miłecki, open list:BROADCOM NVRAM DRIVER, open list
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;
> }
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format
2019-05-14 17:38 [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
2019-05-14 17:38 ` [PATCH v2 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
2019-05-15 5:17 ` [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Philippe Mathieu-Daudé
@ 2019-08-26 11:04 ` Paul Burton
2 siblings, 0 replies; 4+ messages in thread
From: Paul Burton @ 2019-08-26 11:04 UTC (permalink / raw)
To: Florian Fainelli
Cc: linux-mips, joe, Florian Fainelli, Rafał Miłecki,
open list:BROADCOM NVRAM DRIVER, open list, linux-mips
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. ]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-26 11:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-14 17:38 [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
2019-05-14 17:38 ` [PATCH v2 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
2019-05-15 5:17 ` [PATCH v2 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Philippe Mathieu-Daudé
2019-08-26 11:04 ` Paul Burton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).