RDMA: Remove unused parameter from ib_modify_qp_is_ok()

The ll parameter is not used in ib_modify_qp_is_ok(), so remove it.

Signed-off-by: Kamal Heib <kamalheib1@gmail.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>

diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index ee5fc84..1e7ad5e 100644 (file)
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -1509,8 +1509,7 @@ static const struct {
 };
 
 bool ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,
-                       enum ib_qp_type type, enum ib_qp_attr_mask mask,
-                       enum rdma_link_layer ll)
+                       enum ib_qp_type type, enum ib_qp_attr_mask mask)
 {
        enum ib_qp_attr_mask req_param, opt_param;
 

diff --git a/drivers/infiniband/hw/bnxt_re/ib_verbs.c b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
index bc2b9e0..9d7c484 100644 (file)
--- a/drivers/infiniband/hw/bnxt_re/ib_verbs.c
+++ b/drivers/infiniband/hw/bnxt_re/ib_verbs.c
@@ -1598,8 +1598,7 @@ int bnxt_re_modify_qp(struct ib_qp *ib_qp, struct ib_qp_attr *qp_attr,
                curr_qp_state = __to_ib_qp_state(qp->qplib_qp.cur_qp_state);
                new_qp_state = qp_attr->qp_state;
                if (!ib_modify_qp_is_ok(curr_qp_state, new_qp_state,
-                                       ib_qp->qp_type, qp_attr_mask,
-                                       IB_LINK_LAYER_ETHERNET)) {
+                                       ib_qp->qp_type, qp_attr_mask)) {
                        dev_err(rdev_to_dev(rdev),
                                "Invalid attribute mask: %#x specified ",
                                qp_attr_mask);

diff --git a/drivers/infiniband/hw/hns/hns_roce_qp.c b/drivers/infiniband/hw/hns/hns_roce_qp.c
index efb7e96..0378fc4 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_qp.c
+++ b/drivers/infiniband/hw/hns/hns_roce_qp.c
@@ -952,8 +952,8 @@ int hns_roce_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                }
        }
 
-       if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask,
-                               IB_LINK_LAYER_ETHERNET)) {
+       if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
+                               attr_mask)) {
                dev_err(dev, "ib_modify_qp_is_ok failed\n");
                goto out;
        }

diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 6dd3cd2..0711ca1 100644 (file)
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -2629,7 +2629,6 @@ enum {
 static int _mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                              int attr_mask, struct ib_udata *udata)
 {
-       enum rdma_link_layer ll = IB_LINK_LAYER_UNSPECIFIED;
        struct mlx4_ib_dev *dev = to_mdev(ibqp->device);
        struct mlx4_ib_qp *qp = to_mqp(ibqp);
        enum ib_qp_state cur_state, new_state;
@@ -2639,13 +2638,8 @@ static int _mlx4_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        cur_state = attr_mask & IB_QP_CUR_STATE ? attr->cur_qp_state : qp->state;
        new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
-       if (cur_state != new_state || cur_state != IB_QPS_RESET) {
-               int port = attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
-               ll = rdma_port_get_link_layer(&dev->ib_dev, port);
-       }
-
        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
-                               attr_mask, ll)) {
+                               attr_mask)) {
                pr_debug("qpn 0x%x: invalid attribute mask specified "
                         "for transition %d to %d. qp_type %d,"
                         " attr_mask 0x%x\n",

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index c49a081..fa8e5dc 100644 (file)
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -3509,7 +3509,6 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        size_t required_cmd_sz;
        int err = -EINVAL;
        int port;
-       enum rdma_link_layer ll = IB_LINK_LAYER_UNSPECIFIED;
 
        if (ibqp->rwq_ind_tbl)
                return -ENOSYS;
@@ -3555,7 +3554,6 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
        if (!(cur_state == new_state && cur_state == IB_QPS_RESET)) {
                port = attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
-               ll = dev->ib_dev.get_link_layer(&dev->ib_dev, port);
        }
 
        if (qp->flags & MLX5_IB_QP_UNDERLAY) {
@@ -3566,7 +3564,8 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                }
        } else if (qp_type != MLX5_IB_QPT_REG_UMR &&
                   qp_type != MLX5_IB_QPT_DCI &&
-                  !ib_modify_qp_is_ok(cur_state, new_state, qp_type, attr_mask, ll)) {
+                  !ib_modify_qp_is_ok(cur_state, new_state, qp_type,
+                                      attr_mask)) {
                mlx5_ib_dbg(dev, "invalid QP state transition from %d to %d, qp_type %d, attr_mask 0x%x\n",
                            cur_state, new_state, ibqp->qp_type, attr_mask);
                goto out;

diff --git a/drivers/infiniband/hw/mthca/mthca_qp.c b/drivers/infiniband/hw/mthca/mthca_qp.c
index 3d37f23..9d178ee 100644 (file)
--- a/drivers/infiniband/hw/mthca/mthca_qp.c
+++ b/drivers/infiniband/hw/mthca/mthca_qp.c
@@ -872,8 +872,8 @@ int mthca_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask,
 
        new_state = attr_mask & IB_QP_STATE ? attr->qp_state : cur_state;
 
-       if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type, attr_mask,
-                               IB_LINK_LAYER_UNSPECIFIED)) {
+       if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
+                               attr_mask)) {
                mthca_dbg(dev, "Bad QP transition (transport %d) "
                          "%d->%d with attr 0x%08x\n",
                          qp->transport, cur_state, new_state,

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
index c158ca9..06d2a7f 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_verbs.c
@@ -1480,8 +1480,7 @@ int ocrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                new_qps = old_qps;
        spin_unlock_irqrestore(&qp->q_lock, flags);
 
-       if (!ib_modify_qp_is_ok(old_qps, new_qps, ibqp->qp_type, attr_mask,
-                               IB_LINK_LAYER_ETHERNET)) {
+       if (!ib_modify_qp_is_ok(old_qps, new_qps, ibqp->qp_type, attr_mask)) {
                pr_err("%s(%d) invalid attribute mask=0x%x specified for\n"
                       "qpn=0x%x of type=0x%x old_qps=0x%x, new_qps=0x%x\n",
                       __func__, dev->id, attr_mask, qp->id, ibqp->qp_type,

diff --git a/drivers/infiniband/hw/qedr/verbs.c b/drivers/infiniband/hw/qedr/verbs.c
index 9d4d165..82ee4b4 100644 (file)
--- a/drivers/infiniband/hw/qedr/verbs.c
+++ b/drivers/infiniband/hw/qedr/verbs.c
@@ -2238,8 +2238,7 @@ int qedr_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
 
        if (rdma_protocol_roce(&dev->ibdev, 1)) {
                if (!ib_modify_qp_is_ok(old_qp_state, new_qp_state,
-                                       ibqp->qp_type, attr_mask,
-                                       IB_LINK_LAYER_ETHERNET)) {
+                                       ibqp->qp_type, attr_mask)) {
                        DP_ERR(dev,
                               "modify qp: invalid attribute mask=0x%x specified for\n"
                               "qpn=0x%x of type=0x%x old_qp_state=0x%x, new_qp_state=0x%x\n",

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
index 60083c0..cf22f57 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c
@@ -499,7 +499,7 @@ int pvrdma_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        next_state = (attr_mask & IB_QP_STATE) ? attr->qp_state : cur_state;
 
        if (!ib_modify_qp_is_ok(cur_state, next_state, ibqp->qp_type,
-                               attr_mask, IB_LINK_LAYER_ETHERNET)) {
+                               attr_mask)) {
                ret = -EINVAL;
                goto out;
        }

diff --git a/drivers/infiniband/sw/rdmavt/qp.c b/drivers/infiniband/sw/rdmavt/qp.c
index 2db71e9..a036a53 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/qp.c
+++ b/drivers/infiniband/sw/rdmavt/qp.c
@@ -1164,11 +1164,8 @@ int rvt_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        int lastwqe = 0;
        int mig = 0;
        int pmtu = 0; /* for gcc warning only */
-       enum rdma_link_layer link;
        int opa_ah;
 
-       link = rdma_port_get_link_layer(ibqp->device, qp->port_num);
-
        spin_lock_irq(&qp->r_lock);
        spin_lock(&qp->s_hlock);
        spin_lock(&qp->s_lock);
@@ -1179,7 +1176,7 @@ int rvt_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        opa_ah = rdma_cap_opa_ah(ibqp->device, qp->port_num);
 
        if (!ib_modify_qp_is_ok(cur_state, new_state, ibqp->qp_type,
-                               attr_mask, link))
+                               attr_mask))
                goto inval;
 
        if (rdi->driver_f.check_modify_qp &&

diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c
index 45b392b..b971090 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_qp.c
+++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -419,8 +419,7 @@ int rxe_qp_chk_attr(struct rxe_dev *rxe, struct rxe_qp *qp,
        enum ib_qp_state new_state = (mask & IB_QP_STATE) ?
                                        attr->qp_state : cur_state;
 
-       if (!ib_modify_qp_is_ok(cur_state, new_state, qp_type(qp), mask,
-                               IB_LINK_LAYER_ETHERNET)) {
+       if (!ib_modify_qp_is_ok(cur_state, new_state, qp_type(qp), mask)) {
                pr_warn("invalid mask or state for qp\n");
                goto err1;
        }

diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 9897d23..f88c107 100644 (file)
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -2742,7 +2742,6 @@ static inline int ib_destroy_usecnt(atomic_t *usecnt,
  * @next_state: Next QP state
  * @type: QP type
  * @mask: Mask of supplied QP attributes
- * @ll : link layer of port
  *
  * This function is a helper function that a low-level driver's
  * modify_qp method can use to validate the consumer's input.  It
@@ -2751,8 +2750,7 @@ static inline int ib_destroy_usecnt(atomic_t *usecnt,
  * and that the attribute mask supplied is allowed for the transition.
  */
 bool ib_modify_qp_is_ok(enum ib_qp_state cur_state, enum ib_qp_state next_state,
-                       enum ib_qp_type type, enum ib_qp_attr_mask mask,
-                       enum rdma_link_layer ll);
+                       enum ib_qp_type type, enum ib_qp_attr_mask mask);
 
 void ib_register_event_handler(struct ib_event_handler *event_handler);
 void ib_unregister_event_handler(struct ib_event_handler *event_handler);