5 files changed, 0 insertions, 32 deletions

diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 3ba0c90e7055..7cd23324f698 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -6854,8 +6854,6 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
                 result = PCI_ERS_RESULT_RECOVERED;
         }
 
-        pci_cleanup_aer_uncorrect_error_status(pdev);
-
         return result;
 }
 
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index 15071e4adb98..55138d6a3182 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2462,8 +2462,6 @@ static pci_ers_result_t fm10k_io_slot_reset(struct pci_dev *pdev)
                 result = PCI_ERS_RESULT_RECOVERED;
         }
 
-        pci_cleanup_aer_uncorrect_error_status(pdev);
-
         return result;
 }
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index ac685ad4d877..784caf3e6700 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -14227,7 +14227,6 @@ static pci_ers_result_t i40e_pci_error_slot_reset(struct pci_dev *pdev)
 {
         struct i40e_pf *pf = pci_get_drvdata(pdev);
         pci_ers_result_t result;
-        int err;
         u32 reg;
 
         dev_dbg(&pdev->dev, "%s\n", __func__);
@@ -14248,14 +14247,6 @@ static pci_ers_result_t i40e_pci_error_slot_reset(struct pci_dev *pdev)
                         result = PCI_ERS_RESULT_DISCONNECT;
         }
 
-        err = pci_cleanup_aer_uncorrect_error_status(pdev);
-        if (err) {
-                dev_info(&pdev->dev,
-                         "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n",
-                         err);
-                /* non-fatal, continue */
-        }
-
         return result;
 }
 
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index a32c576c1e65..c7ff2f861247 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -9116,7 +9116,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
         struct igb_adapter *adapter = netdev_priv(netdev);
         struct e1000_hw *hw = &adapter->hw;
         pci_ers_result_t result;
-        int err;
 
         if (pci_enable_device_mem(pdev)) {
                 dev_err(&pdev->dev,
@@ -9140,14 +9139,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
                 result = PCI_ERS_RESULT_RECOVERED;
         }
 
-        err = pci_cleanup_aer_uncorrect_error_status(pdev);
-        if (err) {
-                dev_err(&pdev->dev,
-                        "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n",
-                        err);
-                /* non-fatal, continue */
-        }
-
         return result;
 }
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 9a23d33a47ed..a0f716713e87 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -11075,8 +11075,6 @@ static pci_ers_result_t ixgbe_io_error_detected(struct pci_dev *pdev,
                         /* Free device reference count */
                         pci_dev_put(vfdev);
                 }
-
-                pci_cleanup_aer_uncorrect_error_status(pdev);
         }
 
         /*
@@ -11126,7 +11124,6 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
 {
         struct ixgbe_adapter *adapter = pci_get_drvdata(pdev);
         pci_ers_result_t result;
-        int err;
 
         if (pci_enable_device_mem(pdev)) {
                 e_err(probe, "Cannot re-enable PCI device after reset.\n");
@@ -11146,13 +11143,6 @@ static pci_ers_result_t ixgbe_io_slot_reset(struct pci_dev *pdev)
                 result = PCI_ERS_RESULT_RECOVERED;
         }
 
-        err = pci_cleanup_aer_uncorrect_error_status(pdev);
-        if (err) {
-                e_dev_err("pci_cleanup_aer_uncorrect_error_status "
-                          "failed 0x%0x\n", err);
-                /* non-fatal, continue */
-        }
-
         return result;
 }