Merge branch 'pci/bjorn-pcie-cap' into next

* pci/bjorn-pcie-cap:
  ath9k: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: Use standard #defines for PCIe Capability ASPM fields
  iwlwifi: collapse wrapper for pcie_capability_read_word()
  iwlegacy: Use standard #defines for PCIe Capability ASPM fields
  iwlegacy: collapse wrapper for pcie_capability_read_word()
  cxgb3: Use standard #defines for PCIe Capability ASPM fields
  PCI: Add standard PCIe Capability Link ASPM field names
  PCI/portdrv: Use PCI Express Capability accessors
  PCI: Use standard PCIe Capability Link register field names
  PCI: Add and use standard PCI-X Capability register names

2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 3da9ecc9ab8..b52630b8ead 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -426,7 +426,8 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist)
 
 static void pcie_config_aspm_dev(struct pci_dev *pdev, u32 val)
 {
-        pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL, 0x3, val);
+        pcie_capability_clear_and_set_word(pdev, PCI_EXP_LNKCTL,
+                                           PCI_EXP_LNKCTL_ASPMC, val);
 }
 
 static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state)
@@ -441,12 +442,12 @@ static void pcie_config_aspm_link(struct pcie_link_state *link, u32 state)
                 return;
         /* Convert ASPM state to upstream/downstream ASPM register state */
         if (state & ASPM_STATE_L0S_UP)
-                dwstream |= PCIE_LINK_STATE_L0S;
+                dwstream |= PCI_EXP_LNKCTL_ASPM_L0S;
         if (state & ASPM_STATE_L0S_DW)
-                upstream |= PCIE_LINK_STATE_L0S;
+                upstream |= PCI_EXP_LNKCTL_ASPM_L0S;
         if (state & ASPM_STATE_L1) {
-                upstream |= PCIE_LINK_STATE_L1;
-                dwstream |= PCIE_LINK_STATE_L1;
+                upstream |= PCI_EXP_LNKCTL_ASPM_L1;
+                dwstream |= PCI_EXP_LNKCTL_ASPM_L1;
         }
         /*
          * Spec 2.0 suggests all functions should be configured the
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index ed129b41462..b42133afca9 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -120,8 +120,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
                  * the value in this field indicates which MSI-X Table entry is
                  * used to generate the interrupt message."
                  */
-                pos = pci_pcie_cap(dev);
-                pci_read_config_word(dev, pos + PCI_EXP_FLAGS, &reg16);
+                pcie_capability_read_word(dev, PCI_EXP_FLAGS, &reg16);
                 entry = (reg16 & PCI_EXP_FLAGS_IRQ) >> 9;
                 if (entry >= nr_entries)
                         goto Error;