Skip to content

Commit

Permalink
PCI: use pci_pcie_cap() in pci core
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Kenji Kaneshige authored and Jesse Barnes committed Nov 24, 2009
1 parent d7b7e60 commit 06a1cba
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions drivers/pci/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -741,8 +741,8 @@ static int pci_save_pcie_state(struct pci_dev *dev)
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);
Expand Down Expand Up @@ -1535,7 +1535,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;

Expand Down Expand Up @@ -2140,7 +2140,7 @@ static int pcie_flr(struct pci_dev *dev, int probe)
u32 cap;
u16 status;

pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
pos = pci_pcie_cap(dev);
if (!pos)
return -ENOTTY;

Expand Down Expand Up @@ -2489,7 +2489,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;

Expand Down Expand Up @@ -2519,7 +2519,7 @@ int pcie_set_readrq(struct pci_dev *dev, int rq)

v = (ffs(rq) - 8) << 12;

cap = pci_find_capability(dev, PCI_CAP_ID_EXP);
cap = pci_pcie_cap(dev);
if (!cap)
goto out;

Expand Down
4 changes: 2 additions & 2 deletions drivers/pci/probe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ static void set_pcie_hotplug_bridge(struct pci_dev *pdev)
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);
Expand Down Expand Up @@ -920,7 +920,7 @@ int pci_cfg_space_size(struct pci_dev *dev)
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)
Expand Down

0 comments on commit 06a1cba

Please sign in to comment.