Skip to content

Commit fd1418d

Browse files
hreineckekeithbusch
authored andcommitted
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]>
1 parent 6f66d04 commit fd1418d

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/nvme/host/tcp.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,11 +2237,7 @@ static int nvme_tcp_setup_ctrl(struct nvme_ctrl *ctrl, bool new)
22372237
nvme_tcp_destroy_io_queues(ctrl, new);
22382238
}
22392239
destroy_admin:
2240-
nvme_quiesce_admin_queue(ctrl);
2241-
blk_sync_queue(ctrl->admin_q);
2242-
nvme_tcp_stop_queue(ctrl, 0);
2243-
nvme_cancel_admin_tagset(ctrl);
2244-
nvme_tcp_destroy_admin_queue(ctrl, new);
2240+
nvme_tcp_teardown_admin_queue(ctrl, false);
22452241
return ret;
22462242
}
22472243

0 commit comments

Comments
 (0)