commit 06a1cbafb253c4c60d6a54a994887f5fbceabcc0
author Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Wed Nov 11 14:30:56 2009 +0900
committer Jesse Barnes <jbarnes@virtuousgeek.org> Tue Nov 24 15:25:12 2009 -0800
tree e534c369ab1878a5d86996c29d629d1f5d8f9f75
parent d7b7e60526d54da4c94afe5f137714cee7d05c41

PCI: use pci_pcie_cap() in pci core

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

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

drivers/pci/probe.c

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 54b9f15..2fdffc0 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -703,7 +703,7 @@
 	u16 reg16;
 	u32 reg32;
 
-	pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+	pos = pci_pcie_cap(pdev);
 	if (!pos)
 		return;
 	pci_read_config_word(pdev, pos + PCI_EXP_FLAGS, &reg16);
@@ -920,7 +920,7 @@
 	if (class == PCI_CLASS_BRIDGE_HOST)
 		return pci_cfg_space_size_ext(dev);
 
-	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+	pos = pci_pcie_cap(dev);
 	if (!pos) {
 		pos = pci_find_capability(dev, PCI_CAP_ID_PCIX);
 		if (!pos)