Commit 0f89f0ec authored by Guixin Liu's avatar Guixin Liu Committed by Jens Axboe
Browse files

nvme-apple: use nvme core helper to cancel requests in tagset 



Use nvme core helper nvme_cancel_tagset and nvme_cancel_admin_tagset
instead of same logic code.

Signed-off-by: default avatarGuixin Liu <kanie@linux.alibaba.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarRuozhu Li <liruozhu@huawei.com>
Reviewed-by: default avatarSven Peter <sven@svenpeter.dev>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 1fcfca78

drivers/nvme/host/apple.c

+2 −5
Original line number Diff line number Diff line
@@ -845,11 +845,8 @@ static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown) 
	apple_nvme_handle_cq(&anv->adminq, true);

	spin_unlock_irqrestore(&anv->lock, flags);



	blk_mq_tagset_busy_iter(&anv->tagset, nvme_cancel_request, &anv->ctrl);

	blk_mq_tagset_busy_iter(&anv->admin_tagset, nvme_cancel_request,

				&anv->ctrl);

	blk_mq_tagset_wait_completed_request(&anv->tagset);

	blk_mq_tagset_wait_completed_request(&anv->admin_tagset);

	nvme_cancel_tagset(&anv->ctrl);

	nvme_cancel_admin_tagset(&anv->ctrl);



	/*

	 * The driver will not be starting up queues again if shutting down so