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: (104 commits)
  IB/iser: Don't change itt endianness
  IB/mlx4: Update module version and release date
  IPoIB: Handle case when P_Key is deleted and re-added at same index
  IB/iser: Release connection resources on RDMA_CM_EVENT_DEVICE_REMOVAL event
  IB/mlx4: Fix incorrect comment
  IB/mlx4: Fix race when detaching a QP from a multicast group
  IB/ehca: Support all ibv_devinfo values in query_device() and query_port()
  RDMA/nes: Free IRQ before killing tasklet
  IB/mthca: Update module version and release date
  IB/mlx4: Update QP state if query QP succeeds
  IB/mthca: Update QP state if query QP succeeds
  RDMA/amso1100: Add check for NULL reply_msg in c2_intr()
  IB/mlx4: Add support for resizing CQs
  IB/mlx4: Add support for modifying CQ moderation parameters
  IPoIB: Support modifying IPoIB CQ event moderation
  IB/core: Add support for modify CQ
  IPoIB: Add basic ethtool support
  mlx4_core: Increase max number of QPs to 128K
  RDMA/amso1100: Add support for "send with invalidate" work requests
  IB/core: Add support for "send with invalidate" work requests
  ...

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index a31439bd3b67..62af74295dbe 100644
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -61,7 +61,7 @@ static int c2_convert_cm_status(u32 c2_status)
         default:
                 printk(KERN_ERR PFX
                        "%s - Unable to convert CM status: %d\n",
-                       __FUNCTION__, c2_status);
+                       __func__, c2_status);
                 return -EIO;
         }
 }
@@ -193,9 +193,9 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
                 pr_debug("%s: event = %s, user_context=%llx, "
                         "resource_type=%x, "
                         "resource=%x, qp_state=%s\n",
-                        __FUNCTION__,
+                        __func__,
                         to_event_str(event_id),
-                        (unsigned long long) be64_to_cpu(wr->ae.ae_generic.user_context),
+                        (unsigned long long) wr->ae.ae_generic.user_context,
                         be32_to_cpu(wr->ae.ae_generic.resource_type),
                         be32_to_cpu(wr->ae.ae_generic.resource),
                         to_qp_state_str(be32_to_cpu(wr->ae.ae_generic.qp_state)));
@@ -259,7 +259,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
                         BUG_ON(1);
                         pr_debug("%s:%d Unexpected event_id=%d on QP=%p, "
                                 "CM_ID=%p\n",
-                                __FUNCTION__, __LINE__,
+                                __func__, __LINE__,
                                 event_id, qp, cm_id);
                         break;
                 }
@@ -276,7 +276,7 @@ void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
                 pr_debug("C2_RES_IND_EP event_id=%d\n", event_id);
                 if (event_id != CCAE_CONNECTION_REQUEST) {
                         pr_debug("%s: Invalid event_id: %d\n",
-                                __FUNCTION__, event_id);
+                                __func__, event_id);
                         break;
                 }
                 cm_event.event = IW_CM_EVENT_CONNECT_REQUEST;