Merge branch 'pci/yijing-mps-v1' into next

* pci/yijing-mps-v1:
  drm/radeon: use pcie_get_readrq() and pcie_set_readrq() to simplify code
  staging: et131x: Use pci_dev->pcie_mpss and pcie_set_readrq() to simplify code
  IB/qib: Drop qib_tune_pcie_caps() and qib_tune_pcie_coalesce() return values
  IB/qib: Use pcie_set_mps() and pcie_get_mps() to simplify code
  IB/qib: Use pci_is_root_bus() to check whether it is a root bus
  tile/PCI: use cached pci_dev->pcie_mpss to simplify code
  PCI: Export pcie_set_mps() and pcie_get_mps()

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index b7180e6e900d..c45593db7718 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -251,15 +251,12 @@ static void fixup_read_and_payload_sizes(void)
         /* Scan for the smallest maximum payload size. */
         for_each_pci_dev(dev) {
                 u32 devcap;
-                int max_payload;
 
                 if (!pci_is_pcie(dev))
                         continue;
 
-                pcie_capability_read_dword(dev, PCI_EXP_DEVCAP, &devcap);
-                max_payload = devcap & PCI_EXP_DEVCAP_PAYLOAD;
-                if (max_payload < smallest_max_payload)
-                        smallest_max_payload = max_payload;
+                if (dev->pcie_mpss < smallest_max_payload)
+                        smallest_max_payload = dev->pcie_mpss;
         }
 
         /* Now, set the max_payload_size for all devices to that value. */