summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2017-12-31 13:01:19 +0100
committerChristoph Hellwig <hch@lst.de>2018-01-08 11:01:59 +0100
commit4caff8fc19f10ffb06f095a9cf5a9e755377112e (patch)
tree35b7ad3511d49f67452876a162fbd46b21e9161d
parentnvmet: rearrange nvmet_ctrl_free() (diff)
downloadlinux-4caff8fc19f10ffb06f095a9cf5a9e755377112e.tar.xz
linux-4caff8fc19f10ffb06f095a9cf5a9e755377112e.zip
nvme-pci: don't open-code nvme_reset_ctrl
Signed-off-by: Sagi Grimberg <sagi@grimberg.me> Signed-off-by: Christoph Hellwig <hch@lst.de>
-rw-r--r--drivers/nvme/host/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 35331fa0013c..add7b18d825d 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2498,10 +2498,10 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (result)
goto release_pools;
- nvme_change_ctrl_state(&dev->ctrl, NVME_CTRL_RESETTING);
dev_info(dev->ctrl.device, "pci function %s\n", dev_name(&pdev->dev));
- queue_work(nvme_wq, &dev->ctrl.reset_work);
+ nvme_reset_ctrl(&dev->ctrl);
+
return 0;
release_pools: