diff options
| author | Guixin Liu <[email protected]> | 2022-07-08 11:06:05 +0800 |
|---|---|---|
| committer | Jens Axboe <[email protected]> | 2022-08-02 17:22:41 -0600 |
| commit | 0f89f0ece50ec12fcec70f22b3a6ea9fd2051688 (patch) | |
| tree | 980b1c4f9ce4bb8ab24a638ad146eaf769aacf30 | |
| parent | 1fcfca78129325c067b1d26f8a1fa33ecc1052c8 (diff) | |
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 <[email protected]>
Reviewed-by: Sagi Grimberg <[email protected]>
Reviewed-by: Ruozhu Li <[email protected]>
Reviewed-by: Sven Peter <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>
Signed-off-by: Jens Axboe <[email protected]>
| -rw-r--r-- | drivers/nvme/host/apple.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c index 5c352d5d8ee6..0510e8e07346 100644 --- 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 |