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

Commit 39a53062 authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Jesse Barnes
Browse files

PCIe AER: use pci_pcie_cap() 



Use pcie_cap() instead of pci_find_capability() to get PCIe capability
offset in PCIe AER driver. This avoids unnecessary search in PCI
configuration space.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 06a1cbaf

drivers/pci/pcie/aer/aerdrv.c

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static void aer_error_resume(struct pci_dev *dev) 
	u16 reg16;



	/* Clean up Root device status */

	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	pos = pci_pcie_cap(dev);

	pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &reg16);

	pci_write_config_word(dev, pos + PCI_EXP_DEVSTA, reg16);

drivers/pci/pcie/aer/aerdrv_core.c

+4 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev) 
	if (!pos)

		return -EIO;



	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	pos = pci_pcie_cap(dev);

	if (!pos)

		return -EIO;
@@ -66,7 +66,7 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev) 
	if (dev->aer_firmware_first)

		return -EIO;



	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	pos = pci_pcie_cap(dev);

	if (!pos)

		return -EIO;
@@ -224,7 +224,7 @@ static int find_device_iter(struct pci_dev *dev, void *data) 
	 */

	if (atomic_read(&dev->enable_cnt) == 0)

		return 0;

	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);

	pos = pci_pcie_cap(dev);

	if (!pos)

		return 0;

	/* Check if AER is enabled */
@@ -618,7 +618,7 @@ void aer_enable_rootport(struct aer_rpc *rpc) 
	u16 reg16;

	u32 reg32;



	pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);

	pos = pci_pcie_cap(pdev);

	/* Clear PCIE Capability's Device Status */

	pci_read_config_word(pdev, pos+PCI_EXP_DEVSTA, &reg16);

	pci_write_config_word(pdev, pos+PCI_EXP_DEVSTA, reg16);