Skip to content

Commit 825c6ab

Browse files
arndbmartinkpetersen
authored andcommitted
scsi: lpfc: use proper format string for dma_addr_t
dma_addr_t may be either u32 or u64, depending on the kernel configuration, and we get a warning for the 32-bit case: drivers/scsi/lpfc/lpfc_nvme.c: In function 'lpfc_nvme_ls_req': drivers/scsi/lpfc/lpfc_logmsg.h:52:52: error: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=] drivers/scsi/lpfc/lpfc_logmsg.h:52:52: error: format '%llu' expects argument of type 'long long unsigned int', but argument 12 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=] drivers/scsi/lpfc/lpfc_nvme.c: In function 'lpfc_nvme_ls_abort': drivers/scsi/lpfc/lpfc_logmsg.h:52:52: error: format '%llu' expects argument of type 'long long unsigned int', but argument 11 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=] drivers/scsi/lpfc/lpfc_logmsg.h:52:52: error: format '%llu' expects argument of type 'long long unsigned int', but argument 12 has type 'dma_addr_t {aka unsigned int}' [-Werror=format=] printk has a special "%pad" format string that passes the dma address by reference to solve this problem. Fixes: 0164956 ("scsi: lpfc: NVME Initiator: bind to nvme_fc api") Signed-off-by: Arnd Bergmann <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 90ec7c9 commit 825c6ab

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/scsi/lpfc/lpfc_nvme.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,11 +457,11 @@ lpfc_nvme_ls_req(struct nvme_fc_local_port *pnvme_lport,
457457
/* Expand print to include key fields. */
458458
lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC,
459459
"6051 ENTER. lport %p, rport %p lsreq%p rqstlen:%d "
460-
"rsplen:%d %llux %llux\n",
460+
"rsplen:%d %pad %pad\n",
461461
pnvme_lport, pnvme_rport,
462462
pnvme_lsreq, pnvme_lsreq->rqstlen,
463-
pnvme_lsreq->rsplen, pnvme_lsreq->rqstdma,
464-
pnvme_lsreq->rspdma);
463+
pnvme_lsreq->rsplen, &pnvme_lsreq->rqstdma,
464+
&pnvme_lsreq->rspdma);
465465

466466
vport->phba->fc4NvmeLsRequests++;
467467

@@ -527,11 +527,11 @@ lpfc_nvme_ls_abort(struct nvme_fc_local_port *pnvme_lport,
527527
/* Expand print to include key fields. */
528528
lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_ABTS,
529529
"6040 ENTER. lport %p, rport %p lsreq %p rqstlen:%d "
530-
"rsplen:%d %llux %llux\n",
530+
"rsplen:%d %pad %pad\n",
531531
pnvme_lport, pnvme_rport,
532532
pnvme_lsreq, pnvme_lsreq->rqstlen,
533-
pnvme_lsreq->rsplen, pnvme_lsreq->rqstdma,
534-
pnvme_lsreq->rspdma);
533+
pnvme_lsreq->rsplen, &pnvme_lsreq->rqstdma,
534+
&pnvme_lsreq->rspdma);
535535

536536
/*
537537
* Lock the ELS ring txcmplq and build a local list of all ELS IOs

0 commit comments

Comments
 (0)