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

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

IB/cxgb3: 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 ac1d6829

drivers/infiniband/hw/cxgb3/iwch.h

+11 −13
Original line number Diff line number Diff line
@@ -153,19 +153,17 @@ static inline int insert_handle(struct iwch_dev *rhp, struct idr *idr, 
				void *handle, u32 id)

{

	int ret;

	int newid;



	do {

		if (!idr_pre_get(idr, GFP_KERNEL)) {

			return -ENOMEM;

		}

	idr_preload(GFP_KERNEL);

	spin_lock_irq(&rhp->lock);

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

		BUG_ON(newid != id);



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



	spin_unlock_irq(&rhp->lock);

	} while (ret == -EAGAIN);

	idr_preload_end();



	return ret;

	BUG_ON(ret == -ENOSPC);

	return ret < 0 ? ret : 0;

}



static inline void remove_handle(struct iwch_dev *rhp, struct idr *idr, u32 id)