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

Commit ac1d6829 authored by Tejun Heo's avatar Tejun Heo Committed by Linus Torvalds
Browse files

IB/amso1100: convert to idr_alloc() 



Convert to the much saner new idr interface.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Cc: Tom Tucker <tom@opengridcomputing.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3b069c5d

drivers/infiniband/hw/amso1100/c2_qp.c

+11 −8
Original line number Diff line number Diff line
@@ -382,14 +382,17 @@ static int c2_alloc_qpn(struct c2_dev *c2dev, struct c2_qp *qp) 
{

	int ret;



        do {

	idr_preload(GFP_KERNEL);

	spin_lock_irq(&c2dev->qp_table.lock);

		ret = idr_get_new_above(&c2dev->qp_table.idr, qp,

					c2dev->qp_table.last++, &qp->qpn);



	ret = idr_alloc(&c2dev->qp_table.idr, qp, c2dev->qp_table.last++, 0,

			GFP_NOWAIT);

	if (ret >= 0)

		qp->qpn = ret;



	spin_unlock_irq(&c2dev->qp_table.lock);

        } while ((ret == -EAGAIN) &&

	 	 idr_pre_get(&c2dev->qp_table.idr, GFP_KERNEL));

	return ret;

	idr_preload_end();

	return ret < 0 ? ret : 0;

}



static void c2_free_qpn(struct c2_dev *c2dev, int qpn)