1 files changed, 4 insertions, 6 deletions

diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c
index 0e2fea893a76..bc3dbc1ba61f 100644
--- a/net/rds/ib_cm.c
+++ b/net/rds/ib_cm.c
@@ -39,7 +39,8 @@
 #include "ib.h"
 
 static char *rds_ib_event_type_strings[] = {
-#define RDS_IB_EVENT_STRING(foo) [IB_EVENT_##foo] = __stringify(foo)
+#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),
@@ -63,11 +64,8 @@ static char *rds_ib_event_type_strings[] = {
 
 static char *rds_ib_event_str(enum ib_event_type type)
 {
-        if (type < ARRAY_SIZE(rds_ib_event_type_strings) &&
-            rds_ib_event_type_strings[type])
-                return rds_ib_event_type_strings[type];
-        else
-                return "unknown";
+        return rds_str_array(rds_ib_event_type_strings,
+                             ARRAY_SIZE(rds_ib_event_type_strings), type);
 };
 
 /*