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

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

IB/cxgb4: 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>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 6fa78009

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+14 −13
Original line number Original line Diff line number Diff line
@@ -260,20 +260,21 @@ static inline int _insert_handle(struct c4iw_dev *rhp, struct idr *idr, 
				 void *handle, u32 id, int lock)

				 void *handle, u32 id, int lock)

{

{

	int ret;

	int ret;

	int newid;





	do {

	if (lock) {

		if (!idr_pre_get(idr, lock ? GFP_KERNEL : GFP_ATOMIC))

		idr_preload(GFP_KERNEL);

			return -ENOMEM;

		if (lock)

		spin_lock_irq(&rhp->lock);

		spin_lock_irq(&rhp->lock);

		ret = idr_get_new_above(idr, handle, id, &newid);

	}

		BUG_ON(!ret && newid != id);



		if (lock)

	ret = idr_alloc(idr, handle, id, id + 1, GFP_ATOMIC);



	if (lock) {

		spin_unlock_irq(&rhp->lock);

		spin_unlock_irq(&rhp->lock);

	} while (ret == -EAGAIN);

		idr_preload_end();

	}





	return ret;

	BUG_ON(ret == -ENOSPC);

	return ret < 0 ? ret : 0;

}

}





static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr,

static inline int insert_handle(struct c4iw_dev *rhp, struct idr *idr,