IB/srpt: Inline trivial CM callback functions

Inline those CM callback functions that are only two lines long.

Signed-off-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Alex Estrin <alex.estrin@intel.com>
Cc: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 64e9107f6f4f43a2f51446b50ae176b608e63b94..ea73594475905e99f1ffd4b34a3ff090f5df3915 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -2320,18 +2320,6 @@ static void srpt_cm_rtu_recv(struct ib_cm_id *cm_id)
        }
 }
 
-static void srpt_cm_timewait_exit(struct ib_cm_id *cm_id)
-{
-       pr_info("Received IB TimeWait exit for cm_id %p.\n", cm_id);
-       srpt_drain_channel(cm_id);
-}
-
-static void srpt_cm_rep_error(struct ib_cm_id *cm_id)
-{
-       pr_info("Received IB REP error for cm_id %p.\n", cm_id);
-       srpt_drain_channel(cm_id);
-}
-
 /**
  * srpt_cm_dreq_recv() - Process reception of a DREQ message.
  */
@@ -2369,15 +2357,6 @@ static void srpt_cm_dreq_recv(struct ib_cm_id *cm_id)
        }
 }
 
-/**
- * srpt_cm_drep_recv() - Process reception of a DREP message.
- */
-static void srpt_cm_drep_recv(struct ib_cm_id *cm_id)
-{
-       pr_info("Received InfiniBand DREP message for cm_id %p.\n", cm_id);
-       srpt_drain_channel(cm_id);
-}
-
 /**
  * srpt_cm_handler() - IB connection manager callback function.
  *
@@ -2409,22 +2388,26 @@ static int srpt_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
                srpt_cm_dreq_recv(cm_id);
                break;
        case IB_CM_DREP_RECEIVED:
-               srpt_cm_drep_recv(cm_id);
+               pr_info("Received CM DREP message for cm_id %p.\n",
+                       cm_id);
+               srpt_drain_channel(cm_id);
                break;
        case IB_CM_TIMEWAIT_EXIT:
-               srpt_cm_timewait_exit(cm_id);
+               pr_info("Received CM TimeWait exit for cm_id %p.\n", cm_id);
+               srpt_drain_channel(cm_id);
                break;
        case IB_CM_REP_ERROR:
-               srpt_cm_rep_error(cm_id);
+               pr_info("Received CM REP error for cm_id %p.\n", cm_id);
+               srpt_drain_channel(cm_id);
                break;
        case IB_CM_DREQ_ERROR:
-               pr_info("Received IB DREQ ERROR event.\n");
+               pr_info("Received CM DREQ ERROR event.\n");
                break;
        case IB_CM_MRA_RECEIVED:
-               pr_info("Received IB MRA event\n");
+               pr_info("Received CM MRA event\n");
                break;
        default:
-               pr_err("received unrecognized IB CM event %d\n", event->event);
+               pr_err("received unrecognized CM event %d\n", event->event);
                break;
        }