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

Commit e9bc2587 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme-rdma: remove nvme_rdma_remove_ctrl 



It is only used in two places, and some of the work done by it will
be taken into common code soon.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent c5017e85

drivers/nvme/host/rdma.c

+8 −10
Original line number Diff line number Diff line
@@ -1755,18 +1755,13 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown) 
	nvme_rdma_destroy_admin_queue(ctrl, shutdown);

}



static void nvme_rdma_remove_ctrl(struct nvme_rdma_ctrl *ctrl)

{

	nvme_remove_namespaces(&ctrl->ctrl);

	nvme_rdma_shutdown_ctrl(ctrl, true);

	nvme_uninit_ctrl(&ctrl->ctrl);

	nvme_put_ctrl(&ctrl->ctrl);

}



static void nvme_rdma_delete_ctrl(struct nvme_ctrl *ctrl)

{

	nvme_stop_ctrl(ctrl);

	nvme_rdma_remove_ctrl(to_rdma_ctrl(ctrl));

	nvme_remove_namespaces(ctrl);

	nvme_rdma_shutdown_ctrl(to_rdma_ctrl(ctrl), true);

	nvme_uninit_ctrl(ctrl);

	nvme_put_ctrl(ctrl);

}



static void nvme_rdma_reset_ctrl_work(struct work_struct *work)
@@ -1802,7 +1797,10 @@ static void nvme_rdma_reset_ctrl_work(struct work_struct *work) 


out_fail:

	dev_warn(ctrl->ctrl.device, "Removing after reset failure\n");

	nvme_rdma_remove_ctrl(ctrl);

	nvme_remove_namespaces(&ctrl->ctrl);

	nvme_rdma_shutdown_ctrl(ctrl, true);

	nvme_uninit_ctrl(&ctrl->ctrl);

	nvme_put_ctrl(&ctrl->ctrl);

}



static const struct nvme_ctrl_ops nvme_rdma_ctrl_ops = {