RDMA/ocrdma: Fix compiler warning

drivers/infiniband/hw/ocrdma/ocrdma_verbs.c: In function ‘_ocrdma_modify_qp’:
drivers/infiniband/hw/ocrdma/ocrdma_verbs.c:1299:31: error: ‘old_qps’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
  status = ocrdma_mbx_modify_qp(dev, qp, attr, attr_mask, old_qps);

ocrdma_mbx_modify_qp() (and subsequent calls) doesn't appear to use old_qps
so it doesn't need to be passed on.  Removing the variable results in the
warning going away.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Acked-by: Devesh Sharma (Devesh.sharma@emulex.com)
Signed-off-by: Roland Dreier <roland@purestorage.com>

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 1664d648cbfc0531080056849d679622bcf0ea18..ac3fbf2db00aa75f4a51912f13e3fa7abfaa7663 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
@@ -2127,8 +2127,7 @@ static int ocrdma_set_av_params(struct ocrdma_qp *qp,
 
 static int ocrdma_set_qp_params(struct ocrdma_qp *qp,
                                struct ocrdma_modify_qp *cmd,
-                               struct ib_qp_attr *attrs, int attr_mask,
-                               enum ib_qp_state old_qps)
+                               struct ib_qp_attr *attrs, int attr_mask)
 {
        int status = 0;
 
@@ -2233,8 +2232,7 @@ pmtu_err:
 }
 
 int ocrdma_mbx_modify_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
-                        struct ib_qp_attr *attrs, int attr_mask,
-                        enum ib_qp_state old_qps)
+                        struct ib_qp_attr *attrs, int attr_mask)
 {
        int status = -ENOMEM;
        struct ocrdma_modify_qp *cmd;
@@ -2257,7 +2255,7 @@ int ocrdma_mbx_modify_qp(struct ocrdma_dev *dev, struct ocrdma_qp *qp,
                    OCRDMA_QP_PARAMS_STATE_MASK;
        }
 
-       status = ocrdma_set_qp_params(qp, cmd, attrs, attr_mask, old_qps);
+       status = ocrdma_set_qp_params(qp, cmd, attrs, attr_mask);
        if (status)
                goto mbx_err;
        status = ocrdma_mbx_cmd(dev, (struct ocrdma_mqe *)cmd);

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
index 82fe332ae6c605b800da9c4b195db1b6399e60e7..db3d55f368bf4c8387b59607579918d24e1aa29e 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_hw.h
@@ -112,8 +112,7 @@ int ocrdma_mbx_create_qp(struct ocrdma_qp *, struct ib_qp_init_attr *attrs,
                         u8 enable_dpp_cq, u16 dpp_cq_id, u16 *dpp_offset,
                         u16 *dpp_credit_lmt);
 int ocrdma_mbx_modify_qp(struct ocrdma_dev *, struct ocrdma_qp *,
-                        struct ib_qp_attr *attrs, int attr_mask,
-                        enum ib_qp_state old_qps);
+                        struct ib_qp_attr *attrs, int attr_mask);
 int ocrdma_mbx_query_qp(struct ocrdma_dev *, struct ocrdma_qp *,
                        struct ocrdma_qp_params *param);
 int ocrdma_mbx_destroy_qp(struct ocrdma_dev *, struct ocrdma_qp *);

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index e0cc201be41a96df4c177ffa9517fec12988ac7d..f1108ebae83a07ce4aae0231abbb4c2cb929b4ef 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1296,7 +1296,7 @@ int _ocrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         */
        if (status < 0)
                return status;
-       status = ocrdma_mbx_modify_qp(dev, qp, attr, attr_mask, old_qps);
+       status = ocrdma_mbx_modify_qp(dev, qp, attr, attr_mask);
        if (!status && attr_mask & IB_QP_STATE && attr->qp_state == IB_QPS_RTR)
                ocrdma_flush_rq_db(qp);