diff options
| author |   Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 14:35:57 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-02-02 14:35:57 -0700 |
| commit | f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c (patch) | |
| tree | 2920a8164d5243bc4c6a5e0eb006f1256ccecf66 /include | |
| parent | Merge branch 'pci/joe-aspm' into next (diff) | |
| parent | PCI: pciehp: Drop suspend/resume ENTRY messages (diff) | |
| download | wireguard-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.tar.xz wireguard-linux-f2dfcde4ccd101fa3ba8f6c27273a0e359ea9c9c.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: pciehp: Drop suspend/resume ENTRY messages
PCI: Document MPS parameters pci=pcie_bus_safe, pci=pcie_bus_perf, etc
PCI: Document hpiosize= and hpmemsize= resource reservation parameters
PCI: Use PCI Express Capability accessor
PCI: Introduce accessor to retrieve PCIe Capabilities Register
PCI: Kill pci_is_reassigndev()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/pci.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 056d3d66b976..7e87b1ed2175 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1697,12 +1697,21 @@ static inline bool pci_is_pcie(struct pci_dev *dev) } /** + * pcie_caps_reg - get the PCIe Capabilities Register + * @dev: PCI device + */ +static inline u16 pcie_caps_reg(const struct pci_dev *dev) +{ + return dev->pcie_flags_reg; +} + +/** * pci_pcie_type - get the PCIe device/port type * @dev: PCI device */ static inline int pci_pcie_type(const struct pci_dev *dev) { - return (dev->pcie_flags_reg & PCI_EXP_FLAGS_TYPE) >> 4; + return (pcie_caps_reg(dev) & PCI_EXP_FLAGS_TYPE) >> 4; } void pci_request_acs(void); |