lkml.org 
[lkml]   [2019]   [Mar]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 3.18 01/41] i2c: sis630: correct format strings
    Date
    From: Louis Taylor <louis@kragniz.eu>

    [ Upstream commit 60f7691c624b41a05bfc3493d9b0519e7951b7ef ]

    When compiling with -Wformat, clang warns:

    drivers/i2c/busses/i2c-sis630.c:482:4: warning: format specifies type
    'unsigned short' but the argument has type 'int' [-Wformat]
    smbus_base + SMB_STS,
    ^~~~~~~~~~~~~~~~~~~~

    drivers/i2c/busses/i2c-sis630.c:483:4: warning: format specifies type
    'unsigned short' but the argument has type 'int' [-Wformat]
    smbus_base + SMB_STS + SIS630_SMB_IOREGION - 1);
    ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

    drivers/i2c/busses/i2c-sis630.c:531:37: warning: format specifies type
    'unsigned short' but the argument has type 'int' [-Wformat]
    "SMBus SIS630 adapter at %04hx", smbus_base + SMB_STS);
    ~~~~~ ^~~~~~~~~~~~~~~~~~~~

    This patch fixes the format strings to use the format type for int.

    Link: https://github.com/ClangBuiltLinux/linux/issues/378
    Signed-off-by: Louis Taylor <louis@kragniz.eu>
    Reviewed-by: Nick Desaulniers <ndesaulniers@google.com>
    Reviewed-by: Jean Delvare <jdelvare@suse.de>
    Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-sis630.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/i2c/busses/i2c-sis630.c b/drivers/i2c/busses/i2c-sis630.c
    index 1e6805b5cef2..a57aa4fe51a4 100644
    --- a/drivers/i2c/busses/i2c-sis630.c
    +++ b/drivers/i2c/busses/i2c-sis630.c
    @@ -478,7 +478,7 @@ static int sis630_setup(struct pci_dev *sis630_dev)
    if (!request_region(smbus_base + SMB_STS, SIS630_SMB_IOREGION,
    sis630_driver.name)) {
    dev_err(&sis630_dev->dev,
    - "I/O Region 0x%04hx-0x%04hx for SMBus already in use.\n",
    + "I/O Region 0x%04x-0x%04x for SMBus already in use.\n",
    smbus_base + SMB_STS,
    smbus_base + SMB_STS + SIS630_SMB_IOREGION - 1);
    retval = -EBUSY;
    @@ -528,7 +528,7 @@ static int sis630_probe(struct pci_dev *dev, const struct pci_device_id *id)
    sis630_adapter.dev.parent = &dev->dev;

    snprintf(sis630_adapter.name, sizeof(sis630_adapter.name),
    - "SMBus SIS630 adapter at %04hx", smbus_base + SMB_STS);
    + "SMBus SIS630 adapter at %04x", smbus_base + SMB_STS);

    return i2c_add_adapter(&sis630_adapter);
    }
    --
    2.19.1
    \
     
     \ /
      Last update: 2019-03-27 19:34    [W:4.027 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site