提交 ccb50d7e 编写于 作者: Z Zhuo Chen 提交者: Zheng Zengkai

crypto: hisilicon - Remove pci_aer_clear_nonfatal_status() call

mainline inclusion
from mainline-v6.1-rc1
commit 00278564
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I5T7AD
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=00278564a60e11df8bcca0ececd8b2f55434e406

----------------------------------------------------------------------

Calls to pci_cleanup_aer_uncorrect_error_status() have already been
removed after commit 62b36c3e ("PCI/AER: Remove
pci_cleanup_aer_uncorrect_error_status() calls"). But in commit
6c6dd580 ("crypto: hisilicon/qm - add controller reset interface")
pci_aer_clear_nonfatal_status() was used again, so remove it in
this patch.

note: pci_cleanup_aer_uncorrect_error_status() was renamed to
pci_aer_clear_nonfatal_status() in commit 894020fd
("PCI/AER: Rationalize error status register clearing")
Signed-off-by: NZhuo Chen <chenzhuo.1@bytedance.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NJiangshui Yang <yangjiangshui@h-partners.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Reviewed-by: NYang Shen <shenyang39@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 5e0ef62b
......@@ -5469,8 +5469,6 @@ pci_ers_result_t hisi_qm_dev_slot_reset(struct pci_dev *pdev)
if (pdev->is_virtfn)
return PCI_ERS_RESULT_RECOVERED;
pci_aer_clear_nonfatal_status(pdev);
/* reset pcie device controller */
ret = qm_controller_reset(qm);
if (ret) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册