From: Vipul Pandya <vipul@chelsio.com>
Date: Wed, 5 Sep 2012 02:01:54 +0000 (+0000)
Subject: RDMA/cxgb4: Update RDMA/cxgb4 due to macro definition removal in cxgb4 driver
X-Git-Tag: v5.15~21567^2~212
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e5619c120d2502eab37265250d4f2b2dc16d4e71;p=mirror_ubuntu-kernels.git

RDMA/cxgb4: Update RDMA/cxgb4 due to macro definition removal in cxgb4 driver

cxgb4 driver has duplicate definitions of registers which will be removed. This
patch updates the RDMA/cxgb4 driver accordingly.

Signed-off-by: Santosh Rastapur <santosh@chelsio.com>
Signed-off-by: Vipul Pandya <vipul@chelsio.com>
Reviewed-by: Sivakumar Subramani <sivasu@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 45aedf1d9338..5213bab2d19b 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -1155,7 +1155,7 @@ static int ring_kernel_db(struct c4iw_qp *qhp, u32 qid, u16 inc)
 		 */
 		if (cxgb4_dbfifo_count(qhp->rhp->rdev.lldi.ports[0], 1) <
 		    (qhp->rhp->rdev.lldi.dbfifo_int_thresh << 5)) {
-			writel(V_QID(qid) | V_PIDX(inc), qhp->wq.db);
+			writel(QID(qid) | PIDX(inc), qhp->wq.db);
 			break;
 		}
 		set_current_state(TASK_UNINTERRUPTIBLE);