]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
scsi: lpfc: Use %zd format string for size_t
authorArnd Bergmann <arnd@arndb.de>
Mon, 17 Oct 2016 12:35:46 +0000 (14:35 +0200)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 27 Feb 2017 06:13:18 +0000 (22:13 -0800)
Orabug: 25486030

A recent bugfix introduced a harmless warning in the lpfc driver:

drivers/scsi/lpfc/lpfc_init.c: In function 'lpfc_write_firmware':
drivers/scsi/lpfc/lpfc_logmsg.h:56:45: error: format '%ld' expects argument of type 'long int', but argument 9 has type 'size_t {aka const unsigned int}' [-Werror=format=]

'size_t' is always the same width as 'long' in the kernel, but the
compiler doesn't know that. The %z modifier is what the standard expects
to be used here, and this shuts up the warning.

Fixes: 679053c651fb ("scsi: lpfc: Fix fw download on SLI-4 FC adapters")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Acked-by: James Smart <james.smart@broadcom.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit efe583c6d3cdafbeb0c039cd5d0f88fd26637065)
Signed-off-by: Brian Maly <brian.maly@oracle.com>
drivers/scsi/lpfc/lpfc_init.c

index 414451bafd0fdfedc1010d5d2b28b5c94765249b..e097a9342ac829b3f5fa4bcd0367ed7e72c4fef9 100644 (file)
@@ -10337,7 +10337,7 @@ lpfc_write_firmware(const struct firmware *fw, void *context)
            ftype != LPFC_FILE_TYPE_GROUP || fsize != fw->size) {
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "3022 Invalid FW image found. "
-                               "Magic:%x Type:%x ID:%x Size %d %ld\n",
+                               "Magic:%x Type:%x ID:%x Size %d %zd\n",
                                magic_number, ftype, fid, fsize, fw->size);
                rc = -EINVAL;
                goto release_out;