Commit 3dd83f40 authored by Sagi Grimberg's avatar Sagi Grimberg Committed by Christoph Hellwig
Browse files

nvme-fc: replace ida_simple[get|remove] with the simler ida_[alloc|free] 



ida_simple_[get|remove] are wrappers anyways.

Signed-off-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarKeith Busch <kbusch@kernel.org>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 8b850475

drivers/nvme/host/fc.c

+8 −8
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ nvme_fc_free_lport(struct kref *ref) 
		complete(&nvme_fc_unload_proceed);

	spin_unlock_irqrestore(&nvme_fc_lock, flags);



	ida_simple_remove(&nvme_fc_local_port_cnt, lport->localport.port_num);

	ida_free(&nvme_fc_local_port_cnt, lport->localport.port_num);

	ida_destroy(&lport->endp_cnt);



	put_device(lport->dev);
@@ -399,7 +399,7 @@ nvme_fc_register_localport(struct nvme_fc_port_info *pinfo, 
		goto out_reghost_failed;

	}



	idx = ida_simple_get(&nvme_fc_local_port_cnt, 0, 0, GFP_KERNEL);

	idx = ida_alloc(&nvme_fc_local_port_cnt, GFP_KERNEL);

	if (idx < 0) {

		ret = -ENOSPC;

		goto out_fail_kfree;
@@ -439,7 +439,7 @@ nvme_fc_register_localport(struct nvme_fc_port_info *pinfo, 
	return 0;



out_ida_put:

	ida_simple_remove(&nvme_fc_local_port_cnt, idx);

	ida_free(&nvme_fc_local_port_cnt, idx);

out_fail_kfree:

	kfree(newrec);

out_reghost_failed:
@@ -535,7 +535,7 @@ nvme_fc_free_rport(struct kref *ref) 
	spin_unlock_irqrestore(&nvme_fc_lock, flags);



	WARN_ON(!list_empty(&rport->disc_list));

	ida_simple_remove(&lport->endp_cnt, rport->remoteport.port_num);

	ida_free(&lport->endp_cnt, rport->remoteport.port_num);



	kfree(rport);
@@ -713,7 +713,7 @@ nvme_fc_register_remoteport(struct nvme_fc_local_port *localport, 
		goto out_lport_put;

	}



	idx = ida_simple_get(&lport->endp_cnt, 0, 0, GFP_KERNEL);

	idx = ida_alloc(&lport->endp_cnt, GFP_KERNEL);

	if (idx < 0) {

		ret = -ENOSPC;

		goto out_kfree_rport;
@@ -2393,7 +2393,7 @@ nvme_fc_ctrl_free(struct kref *ref) 
	put_device(ctrl->dev);

	nvme_fc_rport_put(ctrl->rport);



	ida_simple_remove(&nvme_fc_ctrl_cnt, ctrl->cnum);

	ida_free(&nvme_fc_ctrl_cnt, ctrl->cnum);

	if (ctrl->ctrl.opts)

		nvmf_free_options(ctrl->ctrl.opts);

	kfree(ctrl);
@@ -3472,7 +3472,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
		goto out_fail;

	}



	idx = ida_simple_get(&nvme_fc_ctrl_cnt, 0, 0, GFP_KERNEL);

	idx = ida_alloc(&nvme_fc_ctrl_cnt, GFP_KERNEL);

	if (idx < 0) {

		ret = -ENOSPC;

		goto out_free_ctrl;
@@ -3635,7 +3635,7 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	kfree(ctrl->queues);

out_free_ida:

	put_device(ctrl->dev);

	ida_simple_remove(&nvme_fc_ctrl_cnt, ctrl->cnum);

	ida_free(&nvme_fc_ctrl_cnt, ctrl->cnum);

out_free_ctrl:

	kfree(ctrl);

out_fail: