summaryrefslogtreecommitdiffstats
path: root/drivers/block/nvme-core.c
diff options
context:
space:
mode:
authorKeith Busch2014-01-27 17:29:40 +0100
committerMatthew Wilcox2014-01-28 02:12:15 +0100
commit09ece1424f52a2d3ad0ab715e96b0fb342af4f03 (patch)
tree2011442081fd0fe6195df1747e74e60d0c9ac04f /drivers/block/nvme-core.c
parentNVMe: Disable admin queue on init failure (diff)
downloadkernel-qcow2-linux-09ece1424f52a2d3ad0ab715e96b0fb342af4f03.tar.gz
kernel-qcow2-linux-09ece1424f52a2d3ad0ab715e96b0fb342af4f03.tar.xz
kernel-qcow2-linux-09ece1424f52a2d3ad0ab715e96b0fb342af4f03.zip
NVMe: Add a pci_driver shutdown method
We need to shut down the device cleanly when the system is being shut down. This was in an earlier patch but was inadvertently lost during a rewrite. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com>
Diffstat (limited to 'drivers/block/nvme-core.c')
-rw-r--r--drivers/block/nvme-core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c
index 89021d710ec2..eaace767be49 100644
--- a/drivers/block/nvme-core.c
+++ b/drivers/block/nvme-core.c
@@ -2554,6 +2554,12 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return result;
}
+static void nvme_shutdown(struct pci_dev *pdev)
+{
+ struct nvme_dev *dev = pci_get_drvdata(pdev);
+ nvme_dev_shutdown(dev);
+}
+
static void nvme_remove(struct pci_dev *pdev)
{
struct nvme_dev *dev = pci_get_drvdata(pdev);
@@ -2625,6 +2631,7 @@ static struct pci_driver nvme_driver = {
.id_table = nvme_id_table,
.probe = nvme_probe,
.remove = nvme_remove,
+ .shutdown = nvme_shutdown,
.driver = {
.pm = &nvme_dev_pm_ops,
},