dev->cq_tbl[cq->id] = NULL;
        indx = ocrdma_get_eq_table_index(dev, cq->eqn);
-       if (indx == -EINVAL)
-               BUG();
+       BUG_ON(indx == -EINVAL);
 
        eq = &dev->eq_tbl[indx];
        irq = ocrdma_get_irq(dev, eq);
                                wqe_idx = (le32_to_cpu(cqe->rq.buftag_qpn) >>
                                        OCRDMA_CQE_BUFTAG_SHIFT) &
                                        qp->srq->rq.max_wqe_idx;
-                               if (wqe_idx < 1)
-                                       BUG();
+                               BUG_ON(wqe_idx < 1);
                                spin_lock_irqsave(&qp->srq->q_lock, flags);
                                ocrdma_hwq_inc_tail(&qp->srq->rq);
                                ocrdma_srq_toggle_bit(qp->srq, wqe_idx - 1);
                if (srq->idx_bit_fields[row]) {
                        indx = ffs(srq->idx_bit_fields[row]);
                        indx = (row * 32) + (indx - 1);
-                       if (indx >= srq->rq.max_cnt)
-                               BUG();
+                       BUG_ON(indx >= srq->rq.max_cnt);
                        ocrdma_srq_toggle_bit(srq, indx);
                        break;
                }
        }
 
-       if (row == srq->bit_fields_len)
-               BUG();
+       BUG_ON(row == srq->bit_fields_len);
        return indx + 1; /* Use from index 1 */
 }
 
        srq = get_ocrdma_srq(qp->ibqp.srq);
        wqe_idx = (le32_to_cpu(cqe->rq.buftag_qpn) >>
                OCRDMA_CQE_BUFTAG_SHIFT) & srq->rq.max_wqe_idx;
-       if (wqe_idx < 1)
-               BUG();
+       BUG_ON(wqe_idx < 1);
 
        ibwc->wr_id = srq->rqe_wr_id_tbl[wqe_idx];
        spin_lock_irqsave(&srq->q_lock, flags);