diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-04-17 00:01:10 -0400 |
---|---|---|
committer | Roland Dreier <rolandd@cisco.com> | 2008-04-17 00:01:10 -0400 |
commit | 3371836383d63b627b228875f5ac63023cbf11d2 (patch) | |
tree | b997894d9774bdc07f7df76ceca48e6a848760c8 /drivers/infiniband/hw/cxgb3/iwch_qp.c | |
parent | e8e91f6b4dc1179a70b0d21241b769c0ebfaa129 (diff) |
IB: Replace remaining __FUNCTION__ occurrences with __func__
__FUNCTION__ is gcc-specific, use __func__ instead.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw/cxgb3/iwch_qp.c')
-rw-r--r-- | drivers/infiniband/hw/cxgb3/iwch_qp.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c index ea2cdd73dd85..bc5d9b0813e5 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_qp.c +++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c | |||
@@ -168,30 +168,30 @@ static int iwch_sgl2pbl_map(struct iwch_dev *rhp, struct ib_sge *sg_list, | |||
168 | 168 | ||
169 | mhp = get_mhp(rhp, (sg_list[i].lkey) >> 8); | 169 | mhp = get_mhp(rhp, (sg_list[i].lkey) >> 8); |
170 | if (!mhp) { | 170 | if (!mhp) { |
171 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 171 | PDBG("%s %d\n", __func__, __LINE__); |
172 | return -EIO; | 172 | return -EIO; |
173 | } | 173 | } |
174 | if (!mhp->attr.state) { | 174 | if (!mhp->attr.state) { |
175 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 175 | PDBG("%s %d\n", __func__, __LINE__); |
176 | return -EIO; | 176 | return -EIO; |
177 | } | 177 | } |
178 | if (mhp->attr.zbva) { | 178 | if (mhp->attr.zbva) { |
179 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 179 | PDBG("%s %d\n", __func__, __LINE__); |
180 | return -EIO; | 180 | return -EIO; |
181 | } | 181 | } |
182 | 182 | ||
183 | if (sg_list[i].addr < mhp->attr.va_fbo) { | 183 | if (sg_list[i].addr < mhp->attr.va_fbo) { |
184 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 184 | PDBG("%s %d\n", __func__, __LINE__); |
185 | return -EINVAL; | 185 | return -EINVAL; |
186 | } | 186 | } |
187 | if (sg_list[i].addr + ((u64) sg_list[i].length) < | 187 | if (sg_list[i].addr + ((u64) sg_list[i].length) < |
188 | sg_list[i].addr) { | 188 | sg_list[i].addr) { |
189 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 189 | PDBG("%s %d\n", __func__, __LINE__); |
190 | return -EINVAL; | 190 | return -EINVAL; |
191 | } | 191 | } |
192 | if (sg_list[i].addr + ((u64) sg_list[i].length) > | 192 | if (sg_list[i].addr + ((u64) sg_list[i].length) > |
193 | mhp->attr.va_fbo + ((u64) mhp->attr.len)) { | 193 | mhp->attr.va_fbo + ((u64) mhp->attr.len)) { |
194 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 194 | PDBG("%s %d\n", __func__, __LINE__); |
195 | return -EINVAL; | 195 | return -EINVAL; |
196 | } | 196 | } |
197 | offset = sg_list[i].addr - mhp->attr.va_fbo; | 197 | offset = sg_list[i].addr - mhp->attr.va_fbo; |
@@ -290,7 +290,7 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
290 | qhp->wq.oldest_read = sqp; | 290 | qhp->wq.oldest_read = sqp; |
291 | break; | 291 | break; |
292 | default: | 292 | default: |
293 | PDBG("%s post of type=%d TBD!\n", __FUNCTION__, | 293 | PDBG("%s post of type=%d TBD!\n", __func__, |
294 | wr->opcode); | 294 | wr->opcode); |
295 | err = -EINVAL; | 295 | err = -EINVAL; |
296 | } | 296 | } |
@@ -309,7 +309,7 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, | |||
309 | Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2), | 309 | Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2), |
310 | 0, t3_wr_flit_cnt); | 310 | 0, t3_wr_flit_cnt); |
311 | PDBG("%s cookie 0x%llx wq idx 0x%x swsq idx %ld opcode %d\n", | 311 | PDBG("%s cookie 0x%llx wq idx 0x%x swsq idx %ld opcode %d\n", |
312 | __FUNCTION__, (unsigned long long) wr->wr_id, idx, | 312 | __func__, (unsigned long long) wr->wr_id, idx, |
313 | Q_PTR2IDX(qhp->wq.sq_wptr, qhp->wq.sq_size_log2), | 313 | Q_PTR2IDX(qhp->wq.sq_wptr, qhp->wq.sq_size_log2), |
314 | sqp->opcode); | 314 | sqp->opcode); |
315 | wr = wr->next; | 315 | wr = wr->next; |
@@ -361,7 +361,7 @@ int iwch_post_receive(struct ib_qp *ibqp, struct ib_recv_wr *wr, | |||
361 | Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2), | 361 | Q_GENBIT(qhp->wq.wptr, qhp->wq.size_log2), |
362 | 0, sizeof(struct t3_receive_wr) >> 3); | 362 | 0, sizeof(struct t3_receive_wr) >> 3); |
363 | PDBG("%s cookie 0x%llx idx 0x%x rq_wptr 0x%x rw_rptr 0x%x " | 363 | PDBG("%s cookie 0x%llx idx 0x%x rq_wptr 0x%x rw_rptr 0x%x " |
364 | "wqe %p \n", __FUNCTION__, (unsigned long long) wr->wr_id, | 364 | "wqe %p \n", __func__, (unsigned long long) wr->wr_id, |
365 | idx, qhp->wq.rq_wptr, qhp->wq.rq_rptr, wqe); | 365 | idx, qhp->wq.rq_wptr, qhp->wq.rq_rptr, wqe); |
366 | ++(qhp->wq.rq_wptr); | 366 | ++(qhp->wq.rq_wptr); |
367 | ++(qhp->wq.wptr); | 367 | ++(qhp->wq.wptr); |
@@ -407,7 +407,7 @@ int iwch_bind_mw(struct ib_qp *qp, | |||
407 | return -ENOMEM; | 407 | return -ENOMEM; |
408 | } | 408 | } |
409 | idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2); | 409 | idx = Q_PTR2IDX(qhp->wq.wptr, qhp->wq.size_log2); |
410 | PDBG("%s: idx 0x%0x, mw 0x%p, mw_bind 0x%p\n", __FUNCTION__, idx, | 410 | PDBG("%s: idx 0x%0x, mw 0x%p, mw_bind 0x%p\n", __func__, idx, |
411 | mw, mw_bind); | 411 | mw, mw_bind); |
412 | wqe = (union t3_wr *) (qhp->wq.queue + idx); | 412 | wqe = (union t3_wr *) (qhp->wq.queue + idx); |
413 | 413 | ||
@@ -595,10 +595,10 @@ int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg) | |||
595 | struct terminate_message *term; | 595 | struct terminate_message *term; |
596 | struct sk_buff *skb; | 596 | struct sk_buff *skb; |
597 | 597 | ||
598 | PDBG("%s %d\n", __FUNCTION__, __LINE__); | 598 | PDBG("%s %d\n", __func__, __LINE__); |
599 | skb = alloc_skb(40, GFP_ATOMIC); | 599 | skb = alloc_skb(40, GFP_ATOMIC); |
600 | if (!skb) { | 600 | if (!skb) { |
601 | printk(KERN_ERR "%s cannot send TERMINATE!\n", __FUNCTION__); | 601 | printk(KERN_ERR "%s cannot send TERMINATE!\n", __func__); |
602 | return -ENOMEM; | 602 | return -ENOMEM; |
603 | } | 603 | } |
604 | wqe = (union t3_wr *)skb_put(skb, 40); | 604 | wqe = (union t3_wr *)skb_put(skb, 40); |
@@ -629,7 +629,7 @@ static void __flush_qp(struct iwch_qp *qhp, unsigned long *flag) | |||
629 | rchp = get_chp(qhp->rhp, qhp->attr.rcq); | 629 | rchp = get_chp(qhp->rhp, qhp->attr.rcq); |
630 | schp = get_chp(qhp->rhp, qhp->attr.scq); | 630 | schp = get_chp(qhp->rhp, qhp->attr.scq); |
631 | 631 | ||
632 | PDBG("%s qhp %p rchp %p schp %p\n", __FUNCTION__, qhp, rchp, schp); | 632 | PDBG("%s qhp %p rchp %p schp %p\n", __func__, qhp, rchp, schp); |
633 | /* take a ref on the qhp since we must release the lock */ | 633 | /* take a ref on the qhp since we must release the lock */ |
634 | atomic_inc(&qhp->refcnt); | 634 | atomic_inc(&qhp->refcnt); |
635 | spin_unlock_irqrestore(&qhp->lock, *flag); | 635 | spin_unlock_irqrestore(&qhp->lock, *flag); |
@@ -720,11 +720,11 @@ static int rdma_init(struct iwch_dev *rhp, struct iwch_qp *qhp, | |||
720 | init_attr.flags |= capable(CAP_NET_BIND_SERVICE) ? PRIV_QP : 0; | 720 | init_attr.flags |= capable(CAP_NET_BIND_SERVICE) ? PRIV_QP : 0; |
721 | init_attr.irs = qhp->ep->rcv_seq; | 721 | init_attr.irs = qhp->ep->rcv_seq; |
722 | PDBG("%s init_attr.rq_addr 0x%x init_attr.rq_size = %d " | 722 | PDBG("%s init_attr.rq_addr 0x%x init_attr.rq_size = %d " |
723 | "flags 0x%x qpcaps 0x%x\n", __FUNCTION__, | 723 | "flags 0x%x qpcaps 0x%x\n", __func__, |
724 | init_attr.rq_addr, init_attr.rq_size, | 724 | init_attr.rq_addr, init_attr.rq_size, |
725 | init_attr.flags, init_attr.qpcaps); | 725 | init_attr.flags, init_attr.qpcaps); |
726 | ret = cxio_rdma_init(&rhp->rdev, &init_attr); | 726 | ret = cxio_rdma_init(&rhp->rdev, &init_attr); |
727 | PDBG("%s ret %d\n", __FUNCTION__, ret); | 727 | PDBG("%s ret %d\n", __func__, ret); |
728 | return ret; | 728 | return ret; |
729 | } | 729 | } |
730 | 730 | ||
@@ -742,7 +742,7 @@ int iwch_modify_qp(struct iwch_dev *rhp, struct iwch_qp *qhp, | |||
742 | int free = 0; | 742 | int free = 0; |
743 | struct iwch_ep *ep = NULL; | 743 | struct iwch_ep *ep = NULL; |
744 | 744 | ||
745 | PDBG("%s qhp %p qpid 0x%x ep %p state %d -> %d\n", __FUNCTION__, | 745 | PDBG("%s qhp %p qpid 0x%x ep %p state %d -> %d\n", __func__, |
746 | qhp, qhp->wq.qpid, qhp->ep, qhp->attr.state, | 746 | qhp, qhp->wq.qpid, qhp->ep, qhp->attr.state, |
747 | (mask & IWCH_QP_ATTR_NEXT_STATE) ? attrs->next_state : -1); | 747 | (mask & IWCH_QP_ATTR_NEXT_STATE) ? attrs->next_state : -1); |
748 | 748 | ||
@@ -899,14 +899,14 @@ int iwch_modify_qp(struct iwch_dev *rhp, struct iwch_qp *qhp, | |||
899 | break; | 899 | break; |
900 | default: | 900 | default: |
901 | printk(KERN_ERR "%s in a bad state %d\n", | 901 | printk(KERN_ERR "%s in a bad state %d\n", |
902 | __FUNCTION__, qhp->attr.state); | 902 | __func__, qhp->attr.state); |
903 | ret = -EINVAL; | 903 | ret = -EINVAL; |
904 | goto err; | 904 | goto err; |
905 | break; | 905 | break; |
906 | } | 906 | } |
907 | goto out; | 907 | goto out; |
908 | err: | 908 | err: |
909 | PDBG("%s disassociating ep %p qpid 0x%x\n", __FUNCTION__, qhp->ep, | 909 | PDBG("%s disassociating ep %p qpid 0x%x\n", __func__, qhp->ep, |
910 | qhp->wq.qpid); | 910 | qhp->wq.qpid); |
911 | 911 | ||
912 | /* disassociate the LLP connection */ | 912 | /* disassociate the LLP connection */ |
@@ -939,7 +939,7 @@ out: | |||
939 | if (free) | 939 | if (free) |
940 | put_ep(&ep->com); | 940 | put_ep(&ep->com); |
941 | 941 | ||
942 | PDBG("%s exit state %d\n", __FUNCTION__, qhp->attr.state); | 942 | PDBG("%s exit state %d\n", __func__, qhp->attr.state); |
943 | return ret; | 943 | return ret; |
944 | } | 944 | } |
945 | 945 | ||