IB/ocrdma: convert to idr_alloc() (cffcd59f) · Commits · 戴 / test

Convert to the much saner new idr interface. Signed-off-by:

Tejun Heo <tj@kernel.org> Cc: Roland Dreier <roland@purestorage.com> Signed-off-by:

drivers/infiniband/hw/ocrdma/ocrdma_main.c

+1 −13

Original line number	Diff line number	Diff line
		@@ -51,18 +51,6 @@ static DEFINE_IDR(ocrdma_dev_id);

		static union ib_gid ocrdma_zero_sgid;

		static int ocrdma_get_instance(void)
		{
		int instance = 0;

		/* Assign an unused number */
		if (!idr_pre_get(&ocrdma_dev_id, GFP_KERNEL))
		return -1;
		if (idr_get_new(&ocrdma_dev_id, NULL, &instance))
		return -1;
		return instance;
		}

		void ocrdma_get_guid(struct ocrdma_dev dev, u8 guid)
		{
		u8 mac_addr[6];
		@@ -416,7 +404,7 @@ static struct ocrdma_dev ocrdma_add(struct be_dev_info dev_info)
		goto idr_err;

		memcpy(&dev->nic_info, dev_info, sizeof(*dev_info));
		dev->id = ocrdma_get_instance();
		dev->id = idr_alloc(&ocrdma_dev_id, NULL, 0, 0, GFP_KERNEL);
		if (dev->id < 0)
		goto idr_err;