diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/nvme/host/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index eb729ff70e7d..d9c0010a9bbc 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c | |||
| @@ -1125,7 +1125,7 @@ static int nvme_suspend_queue(struct nvme_queue *nvmeq) | |||
| 1125 | spin_unlock_irq(&nvmeq->q_lock); | 1125 | spin_unlock_irq(&nvmeq->q_lock); |
| 1126 | 1126 | ||
| 1127 | if (!nvmeq->qid && nvmeq->dev->ctrl.admin_q) | 1127 | if (!nvmeq->qid && nvmeq->dev->ctrl.admin_q) |
| 1128 | blk_mq_stop_hw_queues(nvmeq->dev->ctrl.admin_q); | 1128 | blk_mq_quiesce_queue(nvmeq->dev->ctrl.admin_q); |
| 1129 | 1129 | ||
| 1130 | pci_free_irq(to_pci_dev(nvmeq->dev->dev), vector, nvmeq); | 1130 | pci_free_irq(to_pci_dev(nvmeq->dev->dev), vector, nvmeq); |
| 1131 | 1131 | ||
| @@ -1315,7 +1315,7 @@ static void nvme_dev_remove_admin(struct nvme_dev *dev) | |||
| 1315 | * user requests may be waiting on a stopped queue. Start the | 1315 | * user requests may be waiting on a stopped queue. Start the |
| 1316 | * queue to flush these to completion. | 1316 | * queue to flush these to completion. |
| 1317 | */ | 1317 | */ |
| 1318 | blk_mq_start_stopped_hw_queues(dev->ctrl.admin_q, true); | 1318 | blk_mq_unquiesce_queue(dev->ctrl.admin_q); |
| 1319 | blk_cleanup_queue(dev->ctrl.admin_q); | 1319 | blk_cleanup_queue(dev->ctrl.admin_q); |
| 1320 | blk_mq_free_tag_set(&dev->admin_tagset); | 1320 | blk_mq_free_tag_set(&dev->admin_tagset); |
| 1321 | } | 1321 | } |
| @@ -1352,7 +1352,7 @@ static int nvme_alloc_admin_tags(struct nvme_dev *dev) | |||
| 1352 | return -ENODEV; | 1352 | return -ENODEV; |
| 1353 | } | 1353 | } |
| 1354 | } else | 1354 | } else |
| 1355 | blk_mq_start_stopped_hw_queues(dev->ctrl.admin_q, true); | 1355 | blk_mq_unquiesce_queue(dev->ctrl.admin_q); |
| 1356 | 1356 | ||
| 1357 | return 0; | 1357 | return 0; |
| 1358 | } | 1358 | } |
