diff options
author | Arnd Bergmann <arnd@arndb.de> | 2017-02-27 15:37:12 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-02-27 22:08:40 -0500 |
commit | 825c6abbc316f496cd2b66e1fa72892cf4b49a9f (patch) | |
tree | b47e507a4aa10c95177f35f082fd9ceb9df7d734 | |
parent | 90ec7c9dff07d676c0b9b499286b931005c6b051 (diff) |
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: 01649561a8b4 ("scsi: lpfc: NVME Initiator: bind to nvme_fc api")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
-rw-r--r-- | drivers/scsi/lpfc/lpfc_nvme.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/scsi/lpfc/lpfc_nvme.c b/drivers/scsi/lpfc/lpfc_nvme.c index 625b6589a34d..609a908ea9db 100644 --- a/drivers/scsi/lpfc/lpfc_nvme.c +++ b/drivers/scsi/lpfc/lpfc_nvme.c | |||
@@ -457,11 +457,11 @@ lpfc_nvme_ls_req(struct nvme_fc_local_port *pnvme_lport, | |||
457 | /* Expand print to include key fields. */ | 457 | /* Expand print to include key fields. */ |
458 | lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC, | 458 | lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_DISC, |
459 | "6051 ENTER. lport %p, rport %p lsreq%p rqstlen:%d " | 459 | "6051 ENTER. lport %p, rport %p lsreq%p rqstlen:%d " |
460 | "rsplen:%d %llux %llux\n", | 460 | "rsplen:%d %pad %pad\n", |
461 | pnvme_lport, pnvme_rport, | 461 | pnvme_lport, pnvme_rport, |
462 | pnvme_lsreq, pnvme_lsreq->rqstlen, | 462 | pnvme_lsreq, pnvme_lsreq->rqstlen, |
463 | pnvme_lsreq->rsplen, pnvme_lsreq->rqstdma, | 463 | pnvme_lsreq->rsplen, &pnvme_lsreq->rqstdma, |
464 | pnvme_lsreq->rspdma); | 464 | &pnvme_lsreq->rspdma); |
465 | 465 | ||
466 | vport->phba->fc4NvmeLsRequests++; | 466 | vport->phba->fc4NvmeLsRequests++; |
467 | 467 | ||
@@ -527,11 +527,11 @@ lpfc_nvme_ls_abort(struct nvme_fc_local_port *pnvme_lport, | |||
527 | /* Expand print to include key fields. */ | 527 | /* Expand print to include key fields. */ |
528 | lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_ABTS, | 528 | lpfc_printf_vlog(vport, KERN_INFO, LOG_NVME_ABTS, |
529 | "6040 ENTER. lport %p, rport %p lsreq %p rqstlen:%d " | 529 | "6040 ENTER. lport %p, rport %p lsreq %p rqstlen:%d " |
530 | "rsplen:%d %llux %llux\n", | 530 | "rsplen:%d %pad %pad\n", |
531 | pnvme_lport, pnvme_rport, | 531 | pnvme_lport, pnvme_rport, |
532 | pnvme_lsreq, pnvme_lsreq->rqstlen, | 532 | pnvme_lsreq, pnvme_lsreq->rqstlen, |
533 | pnvme_lsreq->rsplen, pnvme_lsreq->rqstdma, | 533 | pnvme_lsreq->rsplen, &pnvme_lsreq->rqstdma, |
534 | pnvme_lsreq->rspdma); | 534 | &pnvme_lsreq->rspdma); |
535 | 535 | ||
536 | /* | 536 | /* |
537 | * Lock the ELS ring txcmplq and build a local list of all ELS IOs | 537 | * Lock the ELS ring txcmplq and build a local list of all ELS IOs |