diff options
author | Christoph Hellwig <hch@lst.de> | 2022-11-08 11:20:12 +0100 |
---|---|---|
committer | Christoph Hellwig <hch@lst.de> | 2022-12-06 14:36:54 +0100 |
commit | 285b6e9b571714270fa503d0e32f244d15b9f85f (patch) | |
tree | 3ed84add4be44902683405ac38b2b9800966e02d /drivers/nvme/host/fc.c | |
parent | nvme: use nvme_wait_ready in nvme_shutdown_ctrl (diff) | |
download | linux-285b6e9b571714270fa503d0e32f244d15b9f85f.tar.xz linux-285b6e9b571714270fa503d0e32f244d15b9f85f.zip |
nvme: merge nvme_shutdown_ctrl into nvme_disable_ctrl
Many of the callers decide which one to use based on a bool argument and
there is at least some code to be shared, so merge these two. Also
move a comment specific to a single callsite to that callsite.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Hector Martin <marcan@marcan.st>
Diffstat (limited to 'drivers/nvme/host/fc.c')
-rw-r--r-- | drivers/nvme/host/fc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c index 42fa450187f8..bb89c7f7196a 100644 --- a/drivers/nvme/host/fc.c +++ b/drivers/nvme/host/fc.c @@ -2518,7 +2518,7 @@ __nvme_fc_abort_outstanding_ios(struct nvme_fc_ctrl *ctrl, bool start_queues) * Other transports, which don't have link-level contexts bound * to sqe's, would try to gracefully shutdown the controller by * writing the registers for shutdown and polling (call - * nvme_shutdown_ctrl()). Given a bunch of i/o was potentially + * nvme_disable_ctrl()). Given a bunch of i/o was potentially * just aborted and we will wait on those contexts, and given * there was no indication of how live the controlelr is on the * link, don't send more io to create more contexts for the |