linux-mips.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format
@ 2019-05-13 21:52 Florian Fainelli
  2019-05-13 21:52 ` [PATCH 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
  2019-05-13 21:57 ` [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Joe Perches
  0 siblings, 2 replies; 3+ messages in thread
From: Florian Fainelli @ 2019-05-13 21:52 UTC (permalink / raw)
  To: linux-mips
  Cc: 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 %zi instead for that purpose.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 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..2d38ebbcf749 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 (%zi 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 (%zi 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] 3+ messages in thread

* [PATCH 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST
  2019-05-13 21:52 [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
@ 2019-05-13 21:52 ` Florian Fainelli
  2019-05-13 21:57 ` [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Joe Perches
  1 sibling, 0 replies; 3+ messages in thread
From: Florian Fainelli @ 2019-05-13 21:52 UTC (permalink / raw)
  To: linux-mips
  Cc: 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] 3+ messages in thread

* Re: [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format
  2019-05-13 21:52 [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
  2019-05-13 21:52 ` [PATCH 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
@ 2019-05-13 21:57 ` Joe Perches
  1 sibling, 0 replies; 3+ messages in thread
From: Joe Perches @ 2019-05-13 21:57 UTC (permalink / raw)
  To: Florian Fainelli, linux-mips
  Cc: Rafał Miłecki, open list:BROADCOM NVRAM DRIVER, open list

On Mon, 2019-05-13 at 14:52 -0700, 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 %zi instead for that purpose.

typically it is %zu



^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-05-13 22:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-13 21:52 [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Florian Fainelli
2019-05-13 21:52 ` [PATCH 2/2] firmware: bcm47xx_nvram: Allow COMPILE_TEST Florian Fainelli
2019-05-13 21:57 ` [PATCH 1/2] firmware: bcm47xx_nvram: Correct size_t printf format Joe Perches

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).