summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2023-10-24 08:13:35 +0200
committerKeith Busch <kbusch@kernel.org>2023-11-06 09:00:13 -0800
commitfd1418de10b9ca03d78404cf00a95138689ea369 (patch)
treefd2a8d7c92fef54095e4875096088ff2f4c043ae
parent6f66d046eade7a5b979e349ac52026ddfe2776b3 (diff)
downloadlinux-fd1418de10b9ca03d78404cf00a95138689ea369.tar.gz
linux-fd1418de10b9ca03d78404cf00a95138689ea369.tar.bz2
linux-fd1418de10b9ca03d78404cf00a95138689ea369.zip
nvme-tcp: avoid open-coding nvme_tcp_teardown_admin_queue()
nvme_tcp_setup_ctrl() has an open-coded version of nvme_tcp_teardown_admin_queue(). Signed-off-by: Hannes Reinecke <hare@suse.de> Tested-by: Mark O'Donovan <shiftee@posteo.net> Signed-off-by: Keith Busch <kbusch@kernel.org>
-rw-r--r--drivers/nvme/host/tcp.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index f97711fc9f9f..89661a9cf850 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -2237,11 +2237,7 @@ destroy_io:
nvme_tcp_destroy_io_queues(ctrl, new);
}
destroy_admin:
- nvme_quiesce_admin_queue(ctrl);
- blk_sync_queue(ctrl->admin_q);
- nvme_tcp_stop_queue(ctrl, 0);
- nvme_cancel_admin_tagset(ctrl);
- nvme_tcp_destroy_admin_queue(ctrl, new);
+ nvme_tcp_teardown_admin_queue(ctrl, false);
return ret;
}