Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62b36c3e authored by Oza Pawandeep's avatar Oza Pawandeep Committed by Bjorn Helgaas
Browse files

PCI/AER: Remove pci_cleanup_aer_uncorrect_error_status() calls 



After bfcb79fc ("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: default avatarOza Pawandeep <poza@codeaurora.org>
[bhelgaas: changelog, remove PCI core changes, remove unused variables]
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 74171e9d

drivers/crypto/qat/qat_common/adf_aer.c

+0 −1
Original line number Diff line number Diff line
@@ -198,7 +198,6 @@ static pci_ers_result_t adf_slot_reset(struct pci_dev *pdev) 
		pr_err("QAT: Can't find acceleration device\n");

		return PCI_ERS_RESULT_DISCONNECT;

	}

	pci_cleanup_aer_uncorrect_error_status(pdev);

	if (adf_dev_aer_schedule_reset(accel_dev, ADF_DEV_RESET_SYNC))

		return PCI_ERS_RESULT_DISCONNECT;

drivers/dma/ioat/init.c

+0 −7
Original line number Diff line number Diff line
@@ -1252,7 +1252,6 @@ static pci_ers_result_t ioat_pcie_error_detected(struct pci_dev *pdev, 
static pci_ers_result_t ioat_pcie_error_slot_reset(struct pci_dev *pdev)

{

	pci_ers_result_t result = PCI_ERS_RESULT_RECOVERED;

	int err;



	dev_dbg(&pdev->dev, "%s post reset handling\n", DRV_NAME);
@@ -1267,12 +1266,6 @@ static pci_ers_result_t ioat_pcie_error_slot_reset(struct pci_dev *pdev) 
		pci_wake_from_d3(pdev, false);

	}



	err = pci_cleanup_aer_uncorrect_error_status(pdev);

	if (err) {

		dev_err(&pdev->dev,

			"AER uncorrect error status clear failed: %#x\n", err);

	}



	return result;

}

drivers/infiniband/hw/hfi1/pcie.c

+0 −1
Original line number Diff line number Diff line
@@ -650,7 +650,6 @@ pci_resume(struct pci_dev *pdev) 
	struct hfi1_devdata *dd = pci_get_drvdata(pdev);



	dd_dev_info(dd, "HFI1 resume function called\n");

	pci_cleanup_aer_uncorrect_error_status(pdev);

	/*

	 * Running jobs will fail, since it's asynchronous

	 * unlike sysfs-requested reset.   Better than

drivers/infiniband/hw/qib/qib_pcie.c

+0 −1
Original line number Diff line number Diff line
@@ -597,7 +597,6 @@ qib_pci_resume(struct pci_dev *pdev) 
	struct qib_devdata *dd = pci_get_drvdata(pdev);



	qib_devinfo(pdev, "QIB resume function called\n");

	pci_cleanup_aer_uncorrect_error_status(pdev);

	/*

	 * Running jobs will fail, since it's asynchronous

	 * unlike sysfs-requested reset.   Better than

drivers/net/ethernet/atheros/alx/main.c

+0 −2
Original line number Diff line number Diff line
@@ -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;