nvme-pci: 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>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 7e7d4802ac6ba6862c3f4d5edf7adbad62b044d5..d8d0aeb6fa0a664528612f86578dacf31d3a80db 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2725,10 +2725,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
        nvme_pci_disable(dev);
        nvme_reap_pending_cqes(dev);
 
-       blk_mq_tagset_busy_iter(&dev->tagset, nvme_cancel_request, &dev->ctrl);
-       blk_mq_tagset_busy_iter(&dev->admin_tagset, nvme_cancel_request, &dev->ctrl);
-       blk_mq_tagset_wait_completed_request(&dev->tagset);
-       blk_mq_tagset_wait_completed_request(&dev->admin_tagset);
+       nvme_cancel_tagset(&dev->ctrl);
+       nvme_cancel_admin_tagset(&dev->ctrl);
 
        /*
         * The driver will not be starting up queues again if shutting down so