16 files changed, 0 insertions, 82 deletions

diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index 6d3221134927..7968c644ad86 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1964,8 +1964,6 @@ static pci_ers_result_t alx_pci_error_slot_reset(struct pci_dev *pdev)
         if (!alx_reset_mac(hw))
                 rc = PCI_ERS_RESULT_RECOVERED;
 out:
-        pci_cleanup_aer_uncorrect_error_status(pdev);
-
         rtnl_unlock();
 
         return rc;
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 122fdb80a789..bbb247116045 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -8793,13 +8793,6 @@ static pci_ers_result_t bnx2_io_slot_reset(struct pci_dev *pdev)
         if (!(bp->flags & BNX2_FLAG_AER_ENABLED))
                 return result;
 
-        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/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 71362b7f6040..1b1f0c1b82b7 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -14385,14 +14385,6 @@ static pci_ers_result_t bnx2x_io_slot_reset(struct pci_dev *pdev)
 
         rtnl_unlock();
 
-        /* If AER, perform cleanup of the PCIe registers */
-        if (bp->flags & AER_ENABLED) {
-                if (pci_cleanup_aer_uncorrect_error_status(pdev))
-                        BNX2X_ERR("pci_cleanup_aer_uncorrect_error_status failed\n");
-                else
-                        DP(NETIF_MSG_HW, "pci_cleanup_aer_uncorrect_error_status succeeded\n");
-        }
-
         return PCI_ERS_RESULT_RECOVERED;
 }
 
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index cecbb1d1f587..1d90f0469093 100644
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -9231,13 +9231,6 @@ static pci_ers_result_t bnxt_io_slot_reset(struct pci_dev *pdev)
 
         rtnl_unlock();
 
-        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 PCI_ERS_RESULT_RECOVERED;
 }
 
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 961e3087d1d3..2e06434122c0 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -4747,7 +4747,6 @@ static pci_ers_result_t eeh_slot_reset(struct pci_dev *pdev)
         pci_set_master(pdev);
         pci_restore_state(pdev);
         pci_save_state(pdev);
-        pci_cleanup_aer_uncorrect_error_status(pdev);
 
         if (t4_wait_dev_ready(adap->regs) < 0)
                 return PCI_ERS_RESULT_DISCONNECT;
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 74d122616e76..544e2e3655d1 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -6151,7 +6151,6 @@ static pci_ers_result_t be_eeh_reset(struct pci_dev *pdev)
         if (status)
                 return PCI_ERS_RESULT_DISCONNECT;
 
-        pci_cleanup_aer_uncorrect_error_status(pdev);
         be_clear_error(adapter, BE_CLEAR_ALL);
         return PCI_ERS_RESULT_RECOVERED;
 }
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;
 }
 
diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
index 69aa7fc392c5..200edc61aa07 100644
--- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
+++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
@@ -1790,11 +1790,6 @@ static pci_ers_result_t netxen_io_slot_reset(struct pci_dev *pdev)
         return err ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;
 }
 
-static void netxen_io_resume(struct pci_dev *pdev)
-{
-        pci_cleanup_aer_uncorrect_error_status(pdev);
-}
-
 static void netxen_nic_shutdown(struct pci_dev *pdev)
 {
         struct netxen_adapter *adapter = pci_get_drvdata(pdev);
@@ -3488,7 +3483,6 @@ netxen_free_ip_list(struct netxen_adapter *adapter, bool master)
 static const struct pci_error_handlers netxen_err_handler = {
         .error_detected = netxen_io_error_detected,
         .slot_reset = netxen_io_slot_reset,
-        .resume = netxen_io_resume,
 };
 
 static struct pci_driver netxen_driver = {
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
index 569d54ededec..635ac7339b3e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -4232,7 +4232,6 @@ static void qlcnic_83xx_io_resume(struct pci_dev *pdev)
 {
         struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 
-        pci_cleanup_aer_uncorrect_error_status(pdev);
         if (test_and_clear_bit(__QLCNIC_AER, &adapter->state))
                 qlcnic_83xx_aer_start_poll_work(adapter);
 }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
index 2d38d1ac2aae..6b3ea531324d 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -3975,7 +3975,6 @@ static void qlcnic_82xx_io_resume(struct pci_dev *pdev)
         u32 state;
         struct qlcnic_adapter *adapter = pci_get_drvdata(pdev);
 
-        pci_cleanup_aer_uncorrect_error_status(pdev);
         state = QLC_SHARED_REG_RD32(adapter, QLCNIC_CRB_DEV_STATE);
         if (state == QLCNIC_DEV_READY && test_and_clear_bit(__QLCNIC_AER,
                                                             &adapter->state))
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 330233286e78..c8e8294ddac5 100644
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -3847,7 +3847,6 @@ static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev)
 {
         struct efx_nic *efx = pci_get_drvdata(pdev);
         pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
-        int rc;
 
         if (pci_enable_device(pdev)) {
                 netif_err(efx, hw, efx->net_dev,
@@ -3855,13 +3854,6 @@ static pci_ers_result_t efx_io_slot_reset(struct pci_dev *pdev)
                 status =  PCI_ERS_RESULT_DISCONNECT;
         }
 
-        rc = pci_cleanup_aer_uncorrect_error_status(pdev);
-        if (rc) {
-                netif_err(efx, hw, efx->net_dev,
-                "pci_cleanup_aer_uncorrect_error_status failed (%d)\n", rc);
-                /* Non-fatal error. Continue. */
-        }
-
         return status;
 }
 
diff --git a/drivers/net/ethernet/sfc/falcon/efx.c b/drivers/net/ethernet/sfc/falcon/efx.c
index dd5530a4f8c8..ccdba0bb00a3 100644
--- a/drivers/net/ethernet/sfc/falcon/efx.c
+++ b/drivers/net/ethernet/sfc/falcon/efx.c
@@ -3186,7 +3186,6 @@ static pci_ers_result_t ef4_io_slot_reset(struct pci_dev *pdev)
 {
         struct ef4_nic *efx = pci_get_drvdata(pdev);
         pci_ers_result_t status = PCI_ERS_RESULT_RECOVERED;
-        int rc;
 
         if (pci_enable_device(pdev)) {
                 netif_err(efx, hw, efx->net_dev,
@@ -3194,13 +3193,6 @@ static pci_ers_result_t ef4_io_slot_reset(struct pci_dev *pdev)
                 status =  PCI_ERS_RESULT_DISCONNECT;
         }
 
-        rc = pci_cleanup_aer_uncorrect_error_status(pdev);
-        if (rc) {
-                netif_err(efx, hw, efx->net_dev,
-                "pci_cleanup_aer_uncorrect_error_status failed (%d)\n", rc);
-                /* Non-fatal error. Continue. */
-        }
-
         return status;
 }