PCI: Use PCI Express Capability accessor

Use PCI Express Capability access functions to simplify device
Capabilities Register usages.

Signed-off-by: Myron Stowe <myron.stowe@redhat.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/access.c b/drivers/pci/access.c
index 3af0478c057bdbf8253f2ad62cebaadef22f3656..5278ac692cbf17c07b926fc41fb9ea055fa932a0 100644 (file)
--- a/drivers/pci/access.c
+++ b/drivers/pci/access.c
@@ -472,7 +472,7 @@ EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
 
 static inline int pcie_cap_version(const struct pci_dev *dev)
 {
-       return dev->pcie_flags_reg & PCI_EXP_FLAGS_VERS;
+       return pcie_caps_reg(dev) & PCI_EXP_FLAGS_VERS;
 }
 
 static inline bool pcie_cap_has_devctl(const struct pci_dev *dev)
@@ -497,7 +497,7 @@ static inline bool pcie_cap_has_sltctl(const struct pci_dev *dev)
        return pcie_cap_version(dev) > 1 ||
               type == PCI_EXP_TYPE_ROOT_PORT ||
               (type == PCI_EXP_TYPE_DOWNSTREAM &&
-               dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT);
+               pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT);
 }
 
 static inline bool pcie_cap_has_rtctl(const struct pci_dev *dev)

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index b42133afca985659f6e9dde41a99ce2a05808a7b..31063ac3099234941e0924e66e2fb4c277deee6d 100644 (file)
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -272,7 +272,7 @@ static int get_port_device_capability(struct pci_dev *dev)
 
        /* Hot-Plug Capable */
        if ((cap_mask & PCIE_PORT_SERVICE_HP) &&
-           dev->pcie_flags_reg & PCI_EXP_FLAGS_SLOT) {
+           pcie_caps_reg(dev) & PCI_EXP_FLAGS_SLOT) {
                pcie_capability_read_dword(dev, PCI_EXP_SLTCAP, &reg32);
                if (reg32 & PCI_EXP_SLTCAP_HPC) {
                        services |= PCIE_PORT_SERVICE_HP;

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 78581e1d3f64b7be9ba5088651c5a26eb0e03c88..63b36281afce5900faccd18eedb8a12cb1da7d41 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1707,7 +1707,7 @@ static inline u16 pcie_caps_reg(const struct pci_dev *dev)
  */
 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);