diff options
author | Roland Dreier <rolandd@cisco.com> | 2006-09-27 17:42:56 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2006-09-27 17:42:56 -0400 |
commit | 6edf602341cd8f6e79479ff7f5bca72562c1f608 (patch) | |
tree | 4dd02ea1fb9d18355f89d4adc43bccc05d0ec64a /drivers | |
parent | cdb8355add9b1d87ecfcb58b12879897dc1e3e36 (diff) |
RDMA/amso1100: Fix compile warnings
Make sure all 64-bit quantities are cast to unsigned long long
when printed with "%ll" printk formats.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_ae.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_alloc.c | 2 | ||||
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_provider.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/amso1100/c2_rnic.c | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c index 08f46c83a3a4..3aae4978e1cb 100644 --- a/drivers/infiniband/hw/amso1100/c2_ae.c +++ b/drivers/infiniband/hw/amso1100/c2_ae.c | |||
@@ -197,7 +197,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index) | |||
197 | "resource=%x, qp_state=%s\n", | 197 | "resource=%x, qp_state=%s\n", |
198 | __FUNCTION__, | 198 | __FUNCTION__, |
199 | to_event_str(event_id), | 199 | to_event_str(event_id), |
200 | be64_to_cpu(wr->ae.ae_generic.user_context), | 200 | (unsigned long long) be64_to_cpu(wr->ae.ae_generic.user_context), |
201 | be32_to_cpu(wr->ae.ae_generic.resource_type), | 201 | be32_to_cpu(wr->ae.ae_generic.resource_type), |
202 | be32_to_cpu(wr->ae.ae_generic.resource), | 202 | be32_to_cpu(wr->ae.ae_generic.resource), |
203 | to_qp_state_str(be32_to_cpu(wr->ae.ae_generic.qp_state))); | 203 | to_qp_state_str(be32_to_cpu(wr->ae.ae_generic.qp_state))); |
diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c b/drivers/infiniband/hw/amso1100/c2_alloc.c index 1d2529992c0c..028a60bbfca9 100644 --- a/drivers/infiniband/hw/amso1100/c2_alloc.c +++ b/drivers/infiniband/hw/amso1100/c2_alloc.c | |||
@@ -115,7 +115,7 @@ u16 *c2_alloc_mqsp(struct c2_dev *c2dev, struct sp_chunk *head, | |||
115 | ((unsigned long) &(head->shared_ptr[mqsp]) - | 115 | ((unsigned long) &(head->shared_ptr[mqsp]) - |
116 | (unsigned long) head); | 116 | (unsigned long) head); |
117 | pr_debug("%s addr %p dma_addr %llx\n", __FUNCTION__, | 117 | pr_debug("%s addr %p dma_addr %llx\n", __FUNCTION__, |
118 | &(head->shared_ptr[mqsp]), (u64)*dma_addr); | 118 | &(head->shared_ptr[mqsp]), (unsigned long long) *dma_addr); |
119 | return &(head->shared_ptr[mqsp]); | 119 | return &(head->shared_ptr[mqsp]); |
120 | } | 120 | } |
121 | return NULL; | 121 | return NULL; |
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c index dd6af551108b..622d6f1f920d 100644 --- a/drivers/infiniband/hw/amso1100/c2_provider.c +++ b/drivers/infiniband/hw/amso1100/c2_provider.c | |||
@@ -397,7 +397,9 @@ static struct ib_mr *c2_reg_phys_mr(struct ib_pd *ib_pd, | |||
397 | pr_debug("%s - page shift %d, pbl_depth %d, total_len %u, " | 397 | pr_debug("%s - page shift %d, pbl_depth %d, total_len %u, " |
398 | "*iova_start %llx, first pa %llx, last pa %llx\n", | 398 | "*iova_start %llx, first pa %llx, last pa %llx\n", |
399 | __FUNCTION__, page_shift, pbl_depth, total_len, | 399 | __FUNCTION__, page_shift, pbl_depth, total_len, |
400 | *iova_start, page_list[0], page_list[pbl_depth-1]); | 400 | (unsigned long long) *iova_start, |
401 | (unsigned long long) page_list[0], | ||
402 | (unsigned long long) page_list[pbl_depth-1]); | ||
401 | err = c2_nsmr_register_phys_kern(to_c2dev(ib_pd->device), page_list, | 403 | err = c2_nsmr_register_phys_kern(to_c2dev(ib_pd->device), page_list, |
402 | (1 << page_shift), pbl_depth, | 404 | (1 << page_shift), pbl_depth, |
403 | total_len, 0, iova_start, | 405 | total_len, 0, iova_start, |
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c index f49a32b7a8f6..e37c5688c214 100644 --- a/drivers/infiniband/hw/amso1100/c2_rnic.c +++ b/drivers/infiniband/hw/amso1100/c2_rnic.c | |||
@@ -527,7 +527,7 @@ int c2_rnic_init(struct c2_dev *c2dev) | |||
527 | DMA_FROM_DEVICE); | 527 | DMA_FROM_DEVICE); |
528 | pci_unmap_addr_set(&c2dev->rep_vq, mapping, c2dev->rep_vq.host_dma); | 528 | pci_unmap_addr_set(&c2dev->rep_vq, mapping, c2dev->rep_vq.host_dma); |
529 | pr_debug("%s rep_vq va %p dma %llx\n", __FUNCTION__, q1_pages, | 529 | pr_debug("%s rep_vq va %p dma %llx\n", __FUNCTION__, q1_pages, |
530 | (u64)c2dev->rep_vq.host_dma); | 530 | (unsigned long long) c2dev->rep_vq.host_dma); |
531 | c2_mq_rep_init(&c2dev->rep_vq, | 531 | c2_mq_rep_init(&c2dev->rep_vq, |
532 | 1, | 532 | 1, |
533 | qsize, | 533 | qsize, |
@@ -550,7 +550,7 @@ int c2_rnic_init(struct c2_dev *c2dev) | |||
550 | DMA_FROM_DEVICE); | 550 | DMA_FROM_DEVICE); |
551 | pci_unmap_addr_set(&c2dev->aeq, mapping, c2dev->aeq.host_dma); | 551 | pci_unmap_addr_set(&c2dev->aeq, mapping, c2dev->aeq.host_dma); |
552 | pr_debug("%s aeq va %p dma %llx\n", __FUNCTION__, q1_pages, | 552 | pr_debug("%s aeq va %p dma %llx\n", __FUNCTION__, q1_pages, |
553 | (u64)c2dev->rep_vq.host_dma); | 553 | (unsigned long long) c2dev->rep_vq.host_dma); |
554 | c2_mq_rep_init(&c2dev->aeq, | 554 | c2_mq_rep_init(&c2dev->aeq, |
555 | 2, | 555 | 2, |
556 | qsize, | 556 | qsize, |