Commit d31131bb authored by Kamal Heib's avatar Kamal Heib Committed by Jason Gunthorpe
Browse files

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: default avatarKamal Heib <kamalheib1@gmail.com>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 03241627

drivers/infiniband/core/verbs.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/hw/bnxt_re/ib_verbs.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/infiniband/hw/hns/hns_roce_qp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}

drivers/infiniband/hw/mlx4/qp.c

+1 −7
Original line number Diff line number Diff line
@@ -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",

drivers/infiniband/hw/mlx5/qp.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE