diff options
author | Oza Pawandeep <poza@codeaurora.org> | 2018-09-28 14:00:56 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2018-10-02 17:04:40 -0400 |
commit | 62b36c3ea664b34004b9d29bf541b6c6ce30e33c (patch) | |
tree | 2f57da1addc293bafecf9bf0b4e4e91360e8ff24 /drivers/net/ethernet/intel/igb/igb_main.c | |
parent | 74171e9dab62bd9ab616c1a8f9f1c13af71f4f5d (diff) |
PCI/AER: Remove pci_cleanup_aer_uncorrect_error_status() calls
After bfcb79fca19d ("PCI/ERR: Run error recovery callbacks for all affected
devices"), AER errors are always cleared by the PCI core and drivers don't
need to do it themselves.
Remove calls to pci_cleanup_aer_uncorrect_error_status() from device
driver error recovery functions.
Signed-off-by: Oza Pawandeep <poza@codeaurora.org>
[bhelgaas: changelog, remove PCI core changes, remove unused variables]
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/net/ethernet/intel/igb/igb_main.c')
-rw-r--r-- | drivers/net/ethernet/intel/igb/igb_main.c | 9 |
1 files changed, 0 insertions, 9 deletions
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) | |||
9116 | struct igb_adapter *adapter = netdev_priv(netdev); | 9116 | struct igb_adapter *adapter = netdev_priv(netdev); |
9117 | struct e1000_hw *hw = &adapter->hw; | 9117 | struct e1000_hw *hw = &adapter->hw; |
9118 | pci_ers_result_t result; | 9118 | pci_ers_result_t result; |
9119 | int err; | ||
9120 | 9119 | ||
9121 | if (pci_enable_device_mem(pdev)) { | 9120 | if (pci_enable_device_mem(pdev)) { |
9122 | dev_err(&pdev->dev, | 9121 | dev_err(&pdev->dev, |
@@ -9140,14 +9139,6 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) | |||
9140 | result = PCI_ERS_RESULT_RECOVERED; | 9139 | result = PCI_ERS_RESULT_RECOVERED; |
9141 | } | 9140 | } |
9142 | 9141 | ||
9143 | err = pci_cleanup_aer_uncorrect_error_status(pdev); | ||
9144 | if (err) { | ||
9145 | dev_err(&pdev->dev, | ||
9146 | "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n", | ||
9147 | err); | ||
9148 | /* non-fatal, continue */ | ||
9149 | } | ||
9150 | |||
9151 | return result; | 9142 | return result; |
9152 | } | 9143 | } |
9153 | 9144 | ||