infiniband, ocrdma, Fix compiler warning

Commit Message

Devesh Sharma Feb. 24, 2014, 12:57 p.m. UTC

Acked-by: Devesh Sharma ([e-mail])


-Regards
 Devesh

-----Original Message-----
From: [e-mail] [mailto:[e-mail]] On Behalf Of Prarit Bhargava

Sent: Wednesday, February 19, 2014 8:25 PM
To: [e-mail]
Cc: Prarit Bhargava; Roland Dreier; Sean Hefty; Hal Rosenstock; Naresh Gottumukkala; Moni Shoua; Matan Barak; Gottumukkala, Naresh
Subject: [PATCH] infiniband, 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 <[e-mail]>


Cc: Roland Dreier <[e-mail]>
Cc: Sean Hefty <[e-mail]>
Cc: Hal Rosenstock <[e-mail]>
Cc: Naresh Gottumukkala <[e-mail]>
Cc: Moni Shoua <[e-mail]>
Or Gerlitz <[e-mail]>
Cc: Matan Barak <[e-mail]>
Cc: "Gottumukkala, Naresh" <[e-mail]>
---
 drivers/infiniband/hw/ocrdma/ocrdma_hw.c    |    8 +++-----
 drivers/infiniband/hw/ocrdma/ocrdma_hw.h    |    3 +--
 drivers/infiniband/hw/ocrdma/ocrdma_verbs.c |    2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

--
1.7.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [e-mail] More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_hw.c b/drivers/infiniband/hw/ocrdma/ocrdma_hw.c
index 1664d64..ac3fbf2 100644
--- 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 82fe332..db3d55f 100644
--- 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 e0cc201..f1108eb 100644
--- 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);