Commit feb4eb06 authored by Florian Fainelli's avatar Florian Fainelli Committed by Paul Burton

firmware: bcm47xx_nvram: Correct size_t printf format

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org
Cc: joe@perches.com
Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
parent d2f96554
...@@ -96,7 +96,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim) ...@@ -96,7 +96,7 @@ static int nvram_find_and_copy(void __iomem *iobase, u32 lim)
nvram_len = size; nvram_len = size;
} }
if (nvram_len >= NVRAM_SPACE) { 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);
nvram_len = NVRAM_SPACE - 1; nvram_len = NVRAM_SPACE - 1;
} }
...@@ -148,7 +148,7 @@ static int nvram_init(void) ...@@ -148,7 +148,7 @@ static int nvram_init(void)
header.len > sizeof(header)) { header.len > sizeof(header)) {
nvram_len = header.len; nvram_len = header.len;
if (nvram_len >= NVRAM_SPACE) { 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); header.len, NVRAM_SPACE);
nvram_len = NVRAM_SPACE - 1; nvram_len = NVRAM_SPACE - 1;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment