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

Vipul Pandya · davem330 · commit e5619c120d25 · 2012-09-05T17:41:40.000-04:00
cxgb4 driver has duplicate definitions of registers which will be removed. This
patch updates the RDMA/cxgb4 driver accordingly.

Signed-off-by: Santosh Rastapur &lt;santosh@chelsio.com&gt;
Signed-off-by: Vipul Pandya &lt;vipul@chelsio.com&gt;
Reviewed-by: Sivakumar Subramani &lt;sivasu@chelsio.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1155,7 +1155,7 @@ static int ring_kernel_db(struct c4iw_qp *qhp, u32 qid, u16 inc)`
`1155`	`1155`	`*/`
`1156`	`1156`	`if (cxgb4_dbfifo_count(qhp->rhp->rdev.lldi.ports[0], 1) <`
`1157`	`1157`	`(qhp->rhp->rdev.lldi.dbfifo_int_thresh << 5)) {`
`1158`		`- writel(V_QID(qid) \| V_PIDX(inc), qhp->wq.db);`
	`1158`	`+ writel(QID(qid) \| PIDX(inc), qhp->wq.db);`
`1159`	`1159`	`break;`
`1160`	`1160`	`}`
`1161`	`1161`	`set_current_state(TASK_UNINTERRUPTIBLE);`