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: Guixin Liu <kanie@linux.alibaba.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Ruozhu Li <liruozhu@huawei.com>
Reviewed-by: Sven Peter <sven@svenpeter.dev>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c
index 5c352d5d8ee67d2f0f258b808db3cd7339009478..0510e8e07346280fc2c4b3ad5240238078bc5389 100644 (file)
--- a/drivers/nvme/host/apple.c
+++ b/drivers/nvme/host/apple.c
@@ -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