diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-23 18:00:08 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-09-23 18:00:08 -0600 |
| commit | 63495fff27dfa0ce89ceb8f6350976e822398c5c (patch) | |
| tree | b453592a137b66666df3016330bd2afac5ab7fbe /drivers/pci | |
| parent | 3ba8b7c542cd06eafbd24f266a00623b89577d9d (diff) | |
| parent | f0308261b1dd5acba5c7e797159e60f94706df7d (diff) | |
| download | op-kernel-dev-63495fff27dfa0ce89ceb8f6350976e822398c5c.zip op-kernel-dev-63495fff27dfa0ce89ceb8f6350976e822398c5c.tar.gz | |
Merge branch 'pci/yijing-pci_is_pcie-v2' into next
* pci/yijing-pci_is_pcie-v2:
powerpc/pci: Use pci_is_pcie() to simplify code
[SCSI] qla2xxx: Use pcie_is_pcie() to simplify code
[SCSI] csiostor: Use pcie_capability_clear_and_set_word() to simplify code
[SCSI] bfa: Use pcie_set()/get_readrq() to simplify code
x86/pci: Use cached pci_dev->pcie_cap to simplify code
PCI: Use pci_is_pcie() to simplify code
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/probe.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 7ef0f86..c90d0f8 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -641,8 +641,7 @@ static void pci_set_bus_speed(struct pci_bus *bus) return; } - pos = pci_find_capability(bridge, PCI_CAP_ID_EXP); - if (pos) { + if (pci_is_pcie(bridge)) { u32 linkcap; u16 linksta; |
