ntb: idt: drop redundant pci_enable_pcie_error_reporting()
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f
("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration, so the
driver doesn't need to do it itself.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this only controls ERR_* Messages from the device. An ERR_*
Message may cause the Root Port to generate an interrupt, depending on the
AER Root Error Command register managed by the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Serge Semin <fancer.lancer@gmail.com>
Signed-off-by: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
parent
ce2188acad
commit
cb2a6d1735
@ -2651,20 +2651,18 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
|
||||
}
|
||||
|
||||
/*
|
||||
* Enable the device advanced error reporting. It's not critical to
|
||||
* The PCI core enables device error reporting. It's not critical to
|
||||
* have AER disabled in the kernel.
|
||||
*
|
||||
* Cleanup nonfatal error status before getting to init.
|
||||
*/
|
||||
ret = pci_enable_pcie_error_reporting(pdev);
|
||||
if (ret != 0)
|
||||
dev_warn(&pdev->dev, "PCIe AER capability disabled\n");
|
||||
else /* Cleanup nonfatal error status before getting to init */
|
||||
pci_aer_clear_nonfatal_status(pdev);
|
||||
pci_aer_clear_nonfatal_status(pdev);
|
||||
|
||||
/* First enable the PCI device */
|
||||
ret = pcim_enable_device(pdev);
|
||||
if (ret != 0) {
|
||||
dev_err(&pdev->dev, "Failed to enable PCIe device\n");
|
||||
goto err_disable_aer;
|
||||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
@ -2692,8 +2690,6 @@ static int idt_init_pci(struct idt_ntb_dev *ndev)
|
||||
|
||||
err_clear_master:
|
||||
pci_clear_master(pdev);
|
||||
err_disable_aer:
|
||||
(void)pci_disable_pcie_error_reporting(pdev);
|
||||
|
||||
return ret;
|
||||
}
|
||||
@ -2714,9 +2710,6 @@ static void idt_deinit_pci(struct idt_ntb_dev *ndev)
|
||||
/* Clear the bus master disabling the Request TLPs translation */
|
||||
pci_clear_master(pdev);
|
||||
|
||||
/* Disable the AER capability */
|
||||
(void)pci_disable_pcie_error_reporting(pdev);
|
||||
|
||||
dev_dbg(&pdev->dev, "NT-function PCIe interface cleared");
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user