Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (26 commits)
  IB/qib: Defer HCA error events to tasklet
  mlx4_core: Bump the driver version to 1.0
  RDMA/cxgb4: Use printk_ratelimited() instead of printk_ratelimit()
  IB/mlx4: Support PMA counters for IBoE
  IB/mlx4: Use flow counters on IBoE ports
  IB/pma: Add include file for IBA performance counters definitions
  mlx4_core: Add network flow counters
  mlx4_core: Fix location of counter index in QP context struct
  mlx4_core: Read extended capabilities into the flags field
  mlx4_core: Extend capability flags to 64 bits
  IB/mlx4: Generate GID change events in IBoE code
  IB/core: Add GID change event
  RDMA/cma: Don't allow IPoIB port space for IBoE
  RDMA: Allow for NULL .modify_device() and .modify_port() methods
  IB/qib: Update active link width
  IB/qib: Fix potential deadlock with link down interrupt
  IB/qib: Add sysfs interface to read free contexts
  IB/mthca: Remove unnecessary read of PCI_CAP_ID_EXP
  IB/qib: Remove double define
  IB/qib: Remove unnecessary read of PCI_CAP_ID_EXP
  ...

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 891cc2ff5f0..4426782ad28 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -255,7 +255,7 @@ int qib_pcie_params(struct qib_devdata *dd, u32 minw, u32 *nent,
         u16 linkstat, speed;
         int pos = 0, pose, ret = 1;
 
-        pose = pci_find_capability(dd->pcidev, PCI_CAP_ID_EXP);
+        pose = pci_pcie_cap(dd->pcidev);
         if (!pose) {
                 qib_dev_err(dd, "Can't find PCI Express capability!\n");
                 /* set up something... */
@@ -509,7 +509,7 @@ static int qib_tune_pcie_coalesce(struct qib_devdata *dd)
                 qib_devinfo(dd->pcidev, "Parent not root\n");
                 return 1;
         }
-        ppos = pci_find_capability(parent, PCI_CAP_ID_EXP);
+        ppos = pci_pcie_cap(parent);
         if (!ppos)
                 return 1;
         if (parent->vendor != 0x8086)
@@ -578,14 +578,14 @@ static int qib_tune_pcie_caps(struct qib_devdata *dd)
                 qib_devinfo(dd->pcidev, "Parent not root\n");
                 goto bail;
         }
-        ppos = pci_find_capability(parent, PCI_CAP_ID_EXP);
+        ppos = pci_pcie_cap(parent);
         if (ppos) {
                 pci_read_config_word(parent, ppos + PCI_EXP_DEVCAP, &pcaps);
                 pci_read_config_word(parent, ppos + PCI_EXP_DEVCTL, &pctl);
         } else
                 goto bail;
         /* Find out supported and configured values for endpoint (us) */
-        epos = pci_find_capability(dd->pcidev, PCI_CAP_ID_EXP);
+        epos = pci_pcie_cap(dd->pcidev);
         if (epos) {
                 pci_read_config_word(dd->pcidev, epos + PCI_EXP_DEVCAP, &ecaps);
                 pci_read_config_word(dd->pcidev, epos + PCI_EXP_DEVCTL, &ectl);