[2/12] PCI: use pci_pcie_cap() in pci core

Commit Message

Kenji Kaneshige Nov. 11, 2009, 5:30 a.m. UTC

None

Patch

Index: 20091110/drivers/pci/pci.c
===================================================================
--- 20091110.orig/drivers/pci/pci.c
+++ 20091110/drivers/pci/pci.c
@@ -737,8 +737,8 @@  static int pci_save_pcie_state(struct pc
 	u16 *cap;
 	u16 flags;
 
-	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
-	if (pos <= 0)
+	pos = pci_pcie_cap(dev);
+	if (!pos)
 		return 0;
 
 	save_state = pci_find_saved_cap(dev, PCI_CAP_ID_EXP);
@@ -1531,7 +1531,7 @@  void pci_enable_ari(struct pci_dev *dev)
 	if (!bridge || !bridge->is_pcie)
 		return;
 
-	pos = pci_find_capability(bridge, PCI_CAP_ID_EXP);
+	pos = pci_pcie_cap(bridge);
 	if (!pos)
 		return;
 
@@ -2136,7 +2136,7 @@  static int pcie_flr(struct pci_dev *dev,
 	u32 cap;
 	u16 status;
 
-	pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+	pos = pci_pcie_cap(dev);
 	if (!pos)
 		return -ENOTTY;
 
@@ -2485,7 +2485,7 @@  int pcie_get_readrq(struct pci_dev *dev)
 	int ret, cap;
 	u16 ctl;
 
-	cap = pci_find_capability(dev, PCI_CAP_ID_EXP);
+	cap = pci_pcie_cap(dev);
 	if (!cap)
 		return -EINVAL;
 
@@ -2515,7 +2515,7 @@  int pcie_set_readrq(struct pci_dev *dev,
 
 	v = (ffs(rq) - 8) << 12;
 
-	cap = pci_find_capability(dev, PCI_CAP_ID_EXP);
+	cap = pci_pcie_cap(dev);
 	if (!cap)
 		goto out;
 
Index: 20091110/drivers/pci/probe.c
===================================================================
--- 20091110.orig/drivers/pci/probe.c
+++ 20091110/drivers/pci/probe.c
@@ -703,7 +703,7 @@  static void set_pcie_hotplug_bridge(stru
 	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 @@  int pci_cfg_space_size(struct pci_dev *d
 	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)