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 <[email protected]> Tested-by: Mark O'Donovan <[email protected]> Signed-off-by: Keith Busch <[email protected]>
raspberrypi · Nov 6, 2023 · fd1418d · fd1418d
1 parent 6f66d04
commit fd1418d
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
@@ -2237,11 +2237,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
 		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;
 }