From: Jan Kiszka <jan.kiszka@web.de>
To: xenomai@xenomai.org
Subject: [PATCH 2/4] drivers/net: Account for renaming of pci_cleanup_aer_uncorrect_error_status in 5.7
Date: Sun, 11 Apr 2021 09:54:19 +0200 [thread overview]
Message-ID: <896969c80aabcce00a32ccd3feb720220d2ac30e.1618127660.git.jan.kiszka@web.de> (raw)
In-Reply-To: <cover.1618127660.git.jan.kiszka@web.de>
From: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kernel/cobalt/include/asm-generic/xenomai/wrappers.h | 4 ++++
kernel/drivers/net/drivers/e1000e/netdev.c | 2 +-
kernel/drivers/net/drivers/igb/igb_main.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
index 2bb344d737..be62ab744b 100644
--- a/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
+++ b/kernel/cobalt/include/asm-generic/xenomai/wrappers.h
@@ -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)
#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 */
diff --git a/kernel/drivers/net/drivers/e1000e/netdev.c b/kernel/drivers/net/drivers/e1000e/netdev.c
index 5beaf2b552..5ce4679113 100644
--- a/kernel/drivers/net/drivers/e1000e/netdev.c
+++ b/kernel/drivers/net/drivers/e1000e/netdev.c
@@ -3778,7 +3778,7 @@ 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);
+ pci_aer_clear_nonfatal_status(pdev);
return result;
}
diff --git a/kernel/drivers/net/drivers/igb/igb_main.c b/kernel/drivers/net/drivers/igb/igb_main.c
index 01960a6c26..2f49ba17fe 100644
--- a/kernel/drivers/net/drivers/igb/igb_main.c
+++ b/kernel/drivers/net/drivers/igb/igb_main.c
@@ -5437,10 +5437,10 @@ 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);
+ err = pci_aer_clear_nonfatal_status(pdev);
if (err) {
dev_err(&pdev->dev,
- "pci_cleanup_aer_uncorrect_error_status failed 0x%0x\n",
+ "pci_aer_clear_nonfatal_status failed 0x%0x\n",
err);
/* non-fatal, continue */
}
--
2.26.2
next prev parent reply other threads:[~2021-04-11 7:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-11 7:54 [PATCH 0/4] Various driver fix-lets Jan Kiszka
2021-04-11 7:54 ` [PATCH 1/4] drivers/can/peak_canfd: Fix building out-of-tree Jan Kiszka
2021-04-11 7:54 ` Jan Kiszka [this message]
2021-04-11 7:54 ` [PATCH 3/4] drivers/net/igb: Replace read_barrier_depends Jan Kiszka
2021-04-11 7:54 ` [PATCH 4/4] drivers/net/r8169: Remove duplicate and usused ether_crc definition Jan Kiszka
2021-04-11 8:51 ` [PATCH 5/4] drivers/net/experimental/e1000: Annotate valid fall-through cases Jan Kiszka
2021-04-11 10:09 ` [PATCH 6/4] drivers/net/igb: Make sure CONFIG_IGB_HWMON is off Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=896969c80aabcce00a32ccd3feb720220d2ac30e.1618127660.git.jan.kiszka@web.de \
--to=jan.kiszka@web.de \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.