RDMA/cxgb4/csiostor: Cleansup FW related macros/register defines for PF/VF and LDST

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / chelsio / cxgb4vf / cxgb4vf_main.c

diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
index 0b42bddaf28443dbdc9317feee3dc43fcab8ade9..7c24b50c7d0b66688bae6c8b152cb87a6110d254 100644 (file)
--- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -1030,10 +1030,10 @@ static int set_rxq_intr_params(struct adapter *adapter, struct sge_rspq *rspq,
 
                pktcnt_idx = closest_thres(&adapter->sge, cnt);
                if (rspq->desc && rspq->pktcnt_idx != pktcnt_idx) {
-                       v = FW_PARAMS_MNEM(FW_PARAMS_MNEM_DMAQ) |
-                           FW_PARAMS_PARAM_X(
+                       v = FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_DMAQ) |
+                           FW_PARAMS_PARAM_X_V(
                                        FW_PARAMS_PARAM_DMAQ_IQ_INTCNTTHRESH) |
-                           FW_PARAMS_PARAM_YZ(rspq->cntxt_id);
+                           FW_PARAMS_PARAM_YZ_V(rspq->cntxt_id);
                        err = t4vf_set_params(adapter, 1, &v, &pktcnt_idx);
                        if (err)
                                return err;
@@ -2184,8 +2184,8 @@ static int adap_init0(struct adapter *adapter)
         * firmware won't understand this and we'll just get
         * unencapsulated messages ...
         */
-       param = FW_PARAMS_MNEM(FW_PARAMS_MNEM_PFVF) |
-               FW_PARAMS_PARAM_X(FW_PARAMS_PARAM_PFVF_CPLFW4MSG_ENCAP);
+       param = FW_PARAMS_MNEM_V(FW_PARAMS_MNEM_PFVF) |
+               FW_PARAMS_PARAM_X_V(FW_PARAMS_PARAM_PFVF_CPLFW4MSG_ENCAP);
        val = 1;
        (void) t4vf_set_params(adapter, 1, &param, &val);