RDS: Switch to generic logging helpers

Signed-off-by: Sagi Grimberg <sagig@mellanox.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

1 files changed, 3 insertions, 33 deletions

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 8a09ee7db3c1..b8d1bdae8a2a 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -39,36 +39,6 @@
 #include "rds.h"
 #include "ib.h"
 
-static char *rds_ib_event_type_strings[] = {
-#define RDS_IB_EVENT_STRING(foo) \
-                [IB_EVENT_##foo] = __stringify(IB_EVENT_##foo)
-        RDS_IB_EVENT_STRING(CQ_ERR),
-        RDS_IB_EVENT_STRING(QP_FATAL),
-        RDS_IB_EVENT_STRING(QP_REQ_ERR),
-        RDS_IB_EVENT_STRING(QP_ACCESS_ERR),
-        RDS_IB_EVENT_STRING(COMM_EST),
-        RDS_IB_EVENT_STRING(SQ_DRAINED),
-        RDS_IB_EVENT_STRING(PATH_MIG),
-        RDS_IB_EVENT_STRING(PATH_MIG_ERR),
-        RDS_IB_EVENT_STRING(DEVICE_FATAL),
-        RDS_IB_EVENT_STRING(PORT_ACTIVE),
-        RDS_IB_EVENT_STRING(PORT_ERR),
-        RDS_IB_EVENT_STRING(LID_CHANGE),
-        RDS_IB_EVENT_STRING(PKEY_CHANGE),
-        RDS_IB_EVENT_STRING(SM_CHANGE),
-        RDS_IB_EVENT_STRING(SRQ_ERR),
-        RDS_IB_EVENT_STRING(SRQ_LIMIT_REACHED),
-        RDS_IB_EVENT_STRING(QP_LAST_WQE_REACHED),
-        RDS_IB_EVENT_STRING(CLIENT_REREGISTER),
-#undef RDS_IB_EVENT_STRING
-};
-
-static char *rds_ib_event_str(enum ib_event_type type)
-{
-        return rds_str_array(rds_ib_event_type_strings,
-                             ARRAY_SIZE(rds_ib_event_type_strings), type);
-};
-
 /*
  * Set the selected protocol version
  */
@@ -243,7 +213,7 @@ static void rds_ib_cm_fill_conn_param(struct rds_connection *conn,
 static void rds_ib_cq_event_handler(struct ib_event *event, void *data)
 {
         rdsdebug("event %u (%s) data %p\n",
-                 event->event, rds_ib_event_str(event->event), data);
+                 event->event, ib_event_msg(event->event), data);
 }
 
 static void rds_ib_qp_event_handler(struct ib_event *event, void *data)
@@ -252,7 +222,7 @@ static void rds_ib_qp_event_handler(struct ib_event *event, void *data)
         struct rds_ib_connection *ic = conn->c_transport_data;
 
         rdsdebug("conn %p ic %p event %u (%s)\n", conn, ic, event->event,
-                 rds_ib_event_str(event->event));
+                 ib_event_msg(event->event));
 
         switch (event->event) {
         case IB_EVENT_COMM_EST:
@@ -261,7 +231,7 @@ static void rds_ib_qp_event_handler(struct ib_event *event, void *data)
         default:
                 rdsdebug("Fatal QP Event %u (%s) "
                         "- connection %pI4->%pI4, reconnecting\n",
-                        event->event, rds_ib_event_str(event->event),
+                        event->event, ib_event_msg(event->event),
                         &conn->c_laddr, &conn->c_faddr);
                 rds_conn_drop(conn);
                 break;