Merge branch 'debugfs_automount' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / infiniband / hw / cxgb4 / device.c

diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 391309a553607a0b1acb83df78cc2aa8ee1d4849..8fb295e4a9ab7199a385dc7778ee6ae1e409a5c1 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -380,12 +380,12 @@ static int dump_stag(int id, void *p, void *data)
                      "stag: idx 0x%x valid %d key 0x%x state %d pdid %d "
                      "perm 0x%x ps %d len 0x%llx va 0x%llx\n",
                      (u32)id<<8,
-                     G_FW_RI_TPTE_VALID(ntohl(tpte.valid_to_pdid)),
-                     G_FW_RI_TPTE_STAGKEY(ntohl(tpte.valid_to_pdid)),
-                     G_FW_RI_TPTE_STAGSTATE(ntohl(tpte.valid_to_pdid)),
-                     G_FW_RI_TPTE_PDID(ntohl(tpte.valid_to_pdid)),
-                     G_FW_RI_TPTE_PERM(ntohl(tpte.locread_to_qpid)),
-                     G_FW_RI_TPTE_PS(ntohl(tpte.locread_to_qpid)),
+                     FW_RI_TPTE_VALID_G(ntohl(tpte.valid_to_pdid)),
+                     FW_RI_TPTE_STAGKEY_G(ntohl(tpte.valid_to_pdid)),
+                     FW_RI_TPTE_STAGSTATE_G(ntohl(tpte.valid_to_pdid)),
+                     FW_RI_TPTE_PDID_G(ntohl(tpte.valid_to_pdid)),
+                     FW_RI_TPTE_PERM_G(ntohl(tpte.locread_to_qpid)),
+                     FW_RI_TPTE_PS_G(ntohl(tpte.locread_to_qpid)),
                      ((u64)ntohl(tpte.len_hi) << 32) | ntohl(tpte.len_lo),
                      ((u64)ntohl(tpte.va_hi) << 32) | ntohl(tpte.va_lo_fbo));
        if (cc < space)