Merge tag 'for-6.4/block-2023-04-21' of git://git.kernel.dk/linux

[linux-block.git] / drivers / nvme / host / pci.c

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index cd7873de312154696079e390e83439983bc0762e..7f25c0fe3a0bf5baf92dcd5f81613ecac75bb593 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -5,7 +5,6 @@
  */
 
 #include <linux/acpi.h>
-#include <linux/aer.h>
 #include <linux/async.h>
 #include <linux/blkdev.h>
 #include <linux/blk-mq.h>
@@ -2535,7 +2534,6 @@ static int nvme_pci_enable(struct nvme_dev *dev)
 
        nvme_map_cmb(dev);
 
-       pci_enable_pcie_error_reporting(pdev);
        pci_save_state(pdev);
 
        result = nvme_pci_configure_admin_queue(dev);
@@ -2600,10 +2598,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown)
        nvme_suspend_io_queues(dev);
        nvme_suspend_queue(dev, 0);
        pci_free_irq_vectors(pdev);
-       if (pci_is_enabled(pdev)) {
-               pci_disable_pcie_error_reporting(pdev);
+       if (pci_is_enabled(pdev))
                pci_disable_device(pdev);
-       }
        nvme_reap_pending_cqes(dev);
 
        nvme_cancel_tagset(&dev->ctrl);