Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2f8a04e authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/rdmavt: Remove duplicated functions 



The free_qpn() function from the hfi1/qib driver which was the basis for
rdmavt_free_qpn() function was accidentally left in the code. Remove it.

Reviewed-by: default avatarMichael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 90dba23e

drivers/infiniband/sw/rdmavt/qp.c

+14 −23
Original line number Diff line number Diff line
@@ -422,15 +422,6 @@ static int alloc_qpn(struct rvt_dev_info *rdi, struct rvt_qpn_table *qpt, 
	return ret;

}



static void free_qpn(struct rvt_qpn_table *qpt, u32 qpn)

{

	struct rvt_qpn_map *map;



	map = qpt->map + qpn / RVT_BITS_PER_PAGE;

	if (map->page)

		clear_bit(qpn & RVT_BITS_PER_PAGE_MASK, map->page);

}



/**

 * rvt_clear_mr_refs - Drop help mr refs

 * @qp: rvt qp data structure
@@ -646,6 +637,19 @@ static void rvt_reset_qp(struct rvt_dev_info *rdi, struct rvt_qp *qp, 
	lockdep_assert_held(&qp->s_lock);

}



/** rvt_free_qpn - Free a qpn from the bit map

 * @qpt: QP table

 * @qpn: queue pair number to free

 */

static void rvt_free_qpn(struct rvt_qpn_table *qpt, u32 qpn)

{

	struct rvt_qpn_map *map;



	map = qpt->map + qpn / RVT_BITS_PER_PAGE;

	if (map->page)

		clear_bit(qpn & RVT_BITS_PER_PAGE_MASK, map->page);

}



/**

 * rvt_create_qp - create a queue pair for a device

 * @ibpd: the protection domain who's device we create the queue pair for
@@ -936,7 +940,7 @@ struct ib_qp *rvt_create_qp(struct ib_pd *ibpd, 
		kref_put(&qp->ip->ref, rvt_release_mmap_info);



bail_qpn:

	free_qpn(&rdi->qp_dev->qpn_table, qp->ibqp.qp_num);

	rvt_free_qpn(&rdi->qp_dev->qpn_table, qp->ibqp.qp_num);



bail_rq_wq:

	if (!qp->ip)
@@ -1325,19 +1329,6 @@ int rvt_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, 
	return -EINVAL;

}



/** rvt_free_qpn - Free a qpn from the bit map

 * @qpt: QP table

 * @qpn: queue pair number to free

 */

static void rvt_free_qpn(struct rvt_qpn_table *qpt, u32 qpn)

{

	struct rvt_qpn_map *map;



	map = qpt->map + qpn / RVT_BITS_PER_PAGE;

	if (map->page)

		clear_bit(qpn & RVT_BITS_PER_PAGE_MASK, map->page);

}



/**

 * rvt_destroy_qp - destroy a queue pair

 * @ibqp: the queue pair to destroy