From: Dave Jiang Date: Mon, 13 Feb 2023 20:28:42 +0000 (-0700) Subject: cxl: remove unnecessary calling of pci_enable_pcie_error_reporting() X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1922a6dc0502ed3fd0786f57cc9e5f515c902009;p=linux.git cxl: remove unnecessary calling of pci_enable_pcie_error_reporting() With this [1] commit upstream, pci_enable_pci_error_report() is no longer necessary for the driver to call. Remove call and related cleanups. [1]: f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native") Signed-off-by: Dave Jiang Link: https://lore.kernel.org/r/167632012093.4153151.5360778069735064322.stgit@djiang5-mobl3.local Signed-off-by: Dan Williams --- diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c index 2bbebbc7e0320..cc8b5a766a827 100644 --- a/drivers/cxl/pci.c +++ b/drivers/cxl/pci.c @@ -412,11 +412,6 @@ static bool is_cxl_restricted(struct pci_dev *pdev) return pci_pcie_type(pdev) == PCI_EXP_TYPE_RC_END; } -static void disable_aer(void *pdev) -{ - pci_disable_pcie_error_reporting(pdev); -} - static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { struct cxl_register_map map; @@ -494,12 +489,6 @@ static int cxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (IS_ERR(cxlmd)) return PTR_ERR(cxlmd); - if (cxlds->regs.ras) { - pci_enable_pcie_error_reporting(pdev); - rc = devm_add_action_or_reset(&pdev->dev, disable_aer, pdev); - if (rc) - return rc; - } pci_save_state(pdev); return rc;