lkml.org 
[lkml]   [2019]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: [PATCH AUTOSEL 5.3 20/49] firmware: bcm47xx_nvram: Correct size_t printf format
    From
    Date


    On 9/29/2019 10:30 AM, Sasha Levin wrote:
    > From: Florian Fainelli <f.fainelli@gmail.com>
    >
    > [ Upstream commit feb4eb060c3aecc3c5076bebe699cd09f1133c41 ]
    >
    > 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.

    This is not a fix that should be backported as it was done only to allow
    the driver to the made buildable with COMPILE_TEST. Please drop it from
    your auto-selection.

    >
    > 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>
    > 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
    > Signed-off-by: Sasha Levin <sashal@kernel.org>
    > ---
    > 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 77eb74666ecbc..6d2820f6aca13 100644
    > --- a/drivers/firmware/broadcom/bcm47xx_nvram.c
    > +++ b/drivers/firmware/broadcom/bcm47xx_nvram.c
    > @@ -96,7 +96,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;
    > }
    > @@ -148,7 +148,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;
    > }
    >

    --
    Florian

    \
     
     \ /
      Last update: 2019-09-29 21:39    [W:6.248 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site