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>

diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index f97711fc9f9fdaef6722a2afe00d7481ff0c751e..89661a9cf850d493d0ff6e69b60a5525154cfbc4 100644 (file)
--- 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;
 }