summaryrefslogtreecommitdiff
path: root/drivers/nvme/host/rdma.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2017-10-29 10:44:31 +0200
committerChristoph Hellwig <hch@lst.de>2017-11-01 16:28:06 +0100
commit6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e (patch)
tree015c68a3118f143e8114fdb25432186164d0b03f /drivers/nvme/host/rdma.c
parente9bc25874c0bde47b65c58ccd01e339a603a7f40 (diff)
downloadlinux-6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e.tar.gz
linux-6cd53d14aaa006b5543f06fbf5e1680ce61c6c6e.tar.xz
nvme: consolidate common code from ->reset_work
No change in behavior except that the FC code cancels two work items a little later now. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: James Smart <james.smart@broadcom.com> Signed-off-by: Christoph Hellwig <hch@lst.de>
Diffstat (limited to 'drivers/nvme/host/rdma.c')
-rw-r--r--drivers/nvme/host/rdma.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index a3521b852ea8..ed6e05018a92 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -1757,11 +1757,7 @@ static void nvme_rdma_shutdown_ctrl(struct nvme_rdma_ctrl *ctrl, bool shutdown)
static void nvme_rdma_delete_ctrl(struct nvme_ctrl *ctrl)
{
- nvme_stop_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)