Commit 896969c8 authored by Jan Kiszka's avatar Jan Kiszka
Browse files

drivers/net: Account for renaming of pci_cleanup_aer_uncorrect_error_status in 5.7


Signed-off-by: Jan Kiszka's avatarJan Kiszka <jan.kiszka@siemens.com>
parent 3e641de2
...@@ -199,4 +199,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name, ...@@ -199,4 +199,8 @@ devm_hwmon_device_register_with_groups(struct device *dev, const char *name,
#define vmalloc_kernel(__size, __flags) __vmalloc(__size, GFP_KERNEL|__flags) #define vmalloc_kernel(__size, __flags) __vmalloc(__size, GFP_KERNEL|__flags)
#endif #endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(5,7,0)
#define pci_aer_clear_nonfatal_status pci_cleanup_aer_uncorrect_error_status
#endif
#endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */ #endif /* _COBALT_ASM_GENERIC_WRAPPERS_H */
...@@ -3778,7 +3778,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev) ...@@ -3778,7 +3778,7 @@ static pci_ers_result_t e1000_io_slot_reset(struct pci_dev *pdev)
result = PCI_ERS_RESULT_RECOVERED; result = PCI_ERS_RESULT_RECOVERED;
} }
pci_cleanup_aer_uncorrect_error_status(pdev); pci_aer_clear_nonfatal_status(pdev);
return result; return result;
} }
......
...@@ -5437,10 +5437,10 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) ...@@ -5437,10 +5437,10 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev)
result = PCI_ERS_RESULT_RECOVERED; result = PCI_ERS_RESULT_RECOVERED;
} }
err = pci_cleanup_aer_uncorrect_error_status(pdev); err = pci_aer_clear_nonfatal_status(pdev);
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n", "pci_aer_clear_nonfatal_status failed 0x%0x\n",
err); err);
/* non-fatal, continue */ /* non-fatal, continue */
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment