nvme-pci: Use pci_sriov_configure_simple() to enable VFs

Instead of implementing our own version of a SR-IOV configuration stub in
the nvme driver, use the existing pci_sriov_configure_simple() function.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index fbc71fac6f1e077ad21d336c8e8ca3e3bc311cbe..284cdd336271f03c04799d385b9e64f376581062 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -2598,24 +2598,6 @@ static void nvme_remove(struct pci_dev *pdev)
        nvme_put_ctrl(&dev->ctrl);
 }
 
-static int nvme_pci_sriov_configure(struct pci_dev *pdev, int numvfs)
-{
-       int ret = 0;
-
-       if (numvfs == 0) {
-               if (pci_vfs_assigned(pdev)) {
-                       dev_warn(&pdev->dev,
-                               "Cannot disable SR-IOV VFs while assigned\n");
-                       return -EPERM;
-               }
-               pci_disable_sriov(pdev);
-               return 0;
-       }
-
-       ret = pci_enable_sriov(pdev, numvfs);
-       return ret ? ret : numvfs;
-}
-
 #ifdef CONFIG_PM_SLEEP
 static int nvme_suspend(struct device *dev)
 {
@@ -2734,7 +2716,7 @@ static struct pci_driver nvme_driver = {
        .driver         = {
                .pm     = &nvme_dev_pm_ops,
        },
-       .sriov_configure = nvme_pci_sriov_configure,
+       .sriov_configure = pci_sriov_configure_simple,
        .err_handler    = &nvme_err_handler,
 };