From: Sagi Grimberg <sagi@grimberg.me>
Date: Sun, 31 Dec 2017 14:01:19 +0200
Subject: nvme-pci: don't open-code nvme_reset_ctrl
Patch-mainline: v4.16-rc1
Git-commit: 4caff8fc19f10ffb06f095a9cf5a9e755377112e
References: FATE#323952, FATE#322506
Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/nvme/host/pci.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2496,10 +2496,10 @@ static int nvme_probe(struct pci_dev *pd
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: