3 files changed, 1 insertions, 4 deletions

diff --git a/drivers/infiniband/core/cache.c b/drivers/infiniband/core/cache.c
index 099d922ae7bd..18e476b3ced0 100644
--- a/drivers/infiniband/core/cache.c
+++ b/drivers/infiniband/core/cache.c
@@ -1478,7 +1478,6 @@ static void ib_cache_event(struct ib_event_handler *handler,
             event->event == IB_EVENT_PORT_ACTIVE ||
             event->event == IB_EVENT_LID_CHANGE  ||
             event->event == IB_EVENT_PKEY_CHANGE ||
-            event->event == IB_EVENT_SM_CHANGE   ||
             event->event == IB_EVENT_CLIENT_REREGISTER ||
             event->event == IB_EVENT_GID_CHANGE) {
                 work = kmalloc(sizeof *work, GFP_ATOMIC);
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c
index d50ff70bb24b..cd338ddc4a39 100644
--- a/drivers/infiniband/core/multicast.c
+++ b/drivers/infiniband/core/multicast.c
@@ -804,7 +804,6 @@ static void mcast_event_handler(struct ib_event_handler *handler,
         switch (event->event) {
         case IB_EVENT_PORT_ERR:
         case IB_EVENT_LID_CHANGE:
-        case IB_EVENT_SM_CHANGE:
         case IB_EVENT_CLIENT_REREGISTER:
                 mcast_groups_event(&dev->port[index], MCAST_GROUP_ERROR);
                 break;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 1e88213459f2..ba09068f6200 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -279,8 +279,7 @@ void ipoib_event(struct ib_event_handler *handler,
         ipoib_dbg(priv, "Event %d on device %s port %d\n", record->event,
                   dev_name(&record->device->dev), record->element.port_num);
 
-        if (record->event == IB_EVENT_SM_CHANGE ||
-            record->event == IB_EVENT_CLIENT_REREGISTER) {
+        if (record->event == IB_EVENT_CLIENT_REREGISTER) {
                 queue_work(ipoib_workqueue, &priv->flush_light);
         } else if (record->event == IB_EVENT_PORT_ERR ||
                    record->event == IB_EVENT_PORT_ACTIVE ||