6 files changed, 27 insertions, 37 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index f1e82a92e61e..5130fc55b8e2 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -927,8 +927,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,
         unsigned long flags;
         int ret = 0;
 
-        service_mask = service_mask ? service_mask :
-                       __constant_cpu_to_be64(~0ULL);
+        service_mask = service_mask ? service_mask : ~cpu_to_be64(0);
         service_id &= service_mask;
         if ((service_id & IB_SERVICE_ID_AGN_MASK) == IB_CM_ASSIGN_SERVICE_ID &&
             (service_id != IB_CM_ASSIGN_SERVICE_ID))
@@ -954,7 +953,7 @@ int ib_cm_listen(struct ib_cm_id *cm_id, __be64 service_id, __be64 service_mask,
         spin_lock_irqsave(&cm.lock, flags);
         if (service_id == IB_CM_ASSIGN_SERVICE_ID) {
                 cm_id->service_id = cpu_to_be64(cm.listen_service_id++);
-                cm_id->service_mask = __constant_cpu_to_be64(~0ULL);
+                cm_id->service_mask = ~cpu_to_be64(0);
         } else {
                 cm_id->service_id = service_id;
                 cm_id->service_mask = service_mask;
@@ -1134,7 +1133,7 @@ int ib_send_cm_req(struct ib_cm_id *cm_id,
                         goto error1;
         }
         cm_id->service_id = param->service_id;
-        cm_id->service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id->service_mask = ~cpu_to_be64(0);
         cm_id_priv->timeout_ms = cm_convert_to_ms(
                                     param->primary_path->packet_life_time) * 2 +
                                  cm_convert_to_ms(
@@ -1545,7 +1544,7 @@ static int cm_req_handler(struct cm_work *work)
         cm_id_priv->id.cm_handler = listen_cm_id_priv->id.cm_handler;
         cm_id_priv->id.context = listen_cm_id_priv->id.context;
         cm_id_priv->id.service_id = req_msg->service_id;
-        cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id_priv->id.service_mask = ~cpu_to_be64(0);
 
         cm_process_routed_req(req_msg, work->mad_recv_wc->wc);
         cm_format_paths_from_req(req_msg, &work->path[0], &work->path[1]);
@@ -2898,7 +2897,7 @@ int ib_send_cm_sidr_req(struct ib_cm_id *cm_id,
                 goto out;
 
         cm_id->service_id = param->service_id;
-        cm_id->service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id->service_mask = ~cpu_to_be64(0);
         cm_id_priv->timeout_ms = param->timeout_ms;
         cm_id_priv->max_cm_retries = param->max_cm_retries;
         ret = cm_alloc_msg(cm_id_priv, &msg);
@@ -2992,7 +2991,7 @@ static int cm_sidr_req_handler(struct cm_work *work)
         cm_id_priv->id.cm_handler = cur_cm_id_priv->id.cm_handler;
         cm_id_priv->id.context = cur_cm_id_priv->id.context;
         cm_id_priv->id.service_id = sidr_req_msg->service_id;
-        cm_id_priv->id.service_mask = __constant_cpu_to_be64(~0ULL);
+        cm_id_priv->id.service_mask = ~cpu_to_be64(0);
 
         cm_format_sidr_req_event(work, &cur_cm_id_priv->id);
         cm_process_work(cm_id_priv, work);
@@ -3789,7 +3788,7 @@ static int __init ib_cm_init(void)
         rwlock_init(&cm.device_lock);
         spin_lock_init(&cm.lock);
         cm.listen_service_table = RB_ROOT;
-        cm.listen_service_id = __constant_be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);
+        cm.listen_service_id = be64_to_cpu(IB_CM_ASSIGN_SERVICE_ID);
         cm.remote_id_table = RB_ROOT;
         cm.remote_qp_table = RB_ROOT;
         cm.remote_sidr_table = RB_ROOT;
diff --git a/drivers/infiniband/core/cm_msgs.h b/drivers/infiniband/core/cm_msgs.h
index aec9c7af825d..7e63c08f697c 100644
--- a/drivers/infiniband/core/cm_msgs.h
+++ b/drivers/infiniband/core/cm_msgs.h
@@ -44,17 +44,17 @@
 
 #define IB_CM_CLASS_VERSION     2 /* IB specification 1.2 */
 
-#define CM_REQ_ATTR_ID      __constant_htons(0x0010)
-#define CM_MRA_ATTR_ID      __constant_htons(0x0011)
-#define CM_REJ_ATTR_ID      __constant_htons(0x0012)
-#define CM_REP_ATTR_ID      __constant_htons(0x0013)
-#define CM_RTU_ATTR_ID      __constant_htons(0x0014)
-#define CM_DREQ_ATTR_ID     __constant_htons(0x0015)
-#define CM_DREP_ATTR_ID     __constant_htons(0x0016)
-#define CM_SIDR_REQ_ATTR_ID __constant_htons(0x0017)
-#define CM_SIDR_REP_ATTR_ID __constant_htons(0x0018)
-#define CM_LAP_ATTR_ID      __constant_htons(0x0019)
-#define CM_APR_ATTR_ID      __constant_htons(0x001A)
+#define CM_REQ_ATTR_ID          cpu_to_be16(0x0010)
+#define CM_MRA_ATTR_ID          cpu_to_be16(0x0011)
+#define CM_REJ_ATTR_ID          cpu_to_be16(0x0012)
+#define CM_REP_ATTR_ID          cpu_to_be16(0x0013)
+#define CM_RTU_ATTR_ID          cpu_to_be16(0x0014)
+#define CM_DREQ_ATTR_ID         cpu_to_be16(0x0015)
+#define CM_DREP_ATTR_ID         cpu_to_be16(0x0016)
+#define CM_SIDR_REQ_ATTR_ID     cpu_to_be16(0x0017)
+#define CM_SIDR_REP_ATTR_ID     cpu_to_be16(0x0018)
+#define CM_LAP_ATTR_ID          cpu_to_be16(0x0019)
+#define CM_APR_ATTR_ID          cpu_to_be16(0x001A)
 
 enum cm_msg_sequence {
         CM_MSG_SEQUENCE_REQ,
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c
index 7913b804311e..d1fba4153332 100644
--- a/drivers/infiniband/core/device.c
+++ b/drivers/infiniband/core/device.c
@@ -193,7 +193,7 @@ void ib_dealloc_device(struct ib_device *device)
 
         BUG_ON(device->reg_state != IB_DEV_UNREGISTERED);
 
-        ib_device_unregister_sysfs(device);
+        kobject_put(&device->dev.kobj);
 }
 EXPORT_SYMBOL(ib_dealloc_device);
 
@@ -348,6 +348,8 @@ void ib_unregister_device(struct ib_device *device)
 
         mutex_unlock(&device_mutex);
 
+        ib_device_unregister_sysfs(device);
+
         spin_lock_irqsave(&device->client_data_lock, flags);
         list_for_each_entry_safe(context, tmp, &device->client_data_list, list)
                 kfree(context);
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c
index 3af2b84cd838..57a3c6f947b2 100644
--- a/drivers/infiniband/core/mad_rmpp.c
+++ b/drivers/infiniband/core/mad_rmpp.c
@@ -735,7 +735,7 @@ process_rmpp_data(struct ib_mad_agent_private *agent,
                 goto bad;
         }
 
-        if (rmpp_hdr->seg_num == __constant_htonl(1)) {
+        if (rmpp_hdr->seg_num == cpu_to_be32(1)) {
                 if (!(ib_get_rmpp_flags(rmpp_hdr) & IB_MGMT_RMPP_FLAG_FIRST)) {
                         rmpp_status = IB_MGMT_RMPP_STATUS_BAD_SEG;
                         goto bad;
diff --git a/drivers/infiniband/core/sa_query.c b/drivers/infiniband/core/sa_query.c
index 7863a50d56f2..1865049e80f7 100644
--- a/drivers/infiniband/core/sa_query.c
+++ b/drivers/infiniband/core/sa_query.c
@@ -395,6 +395,8 @@ static void update_sm_ah(struct work_struct *work)
         }
 
         spin_lock_irq(&port->ah_lock);
+        if (port->sm_ah)
+                kref_put(&port->sm_ah->ref, free_sm_ah);
         port->sm_ah = new_ah;
         spin_unlock_irq(&port->ah_lock);
 
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index b43f7d3682d3..5c04cfb54cb9 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -66,11 +66,6 @@ struct port_table_attribute {
         int                     index;
 };
 
-static inline int ibdev_is_alive(const struct ib_device *dev)
-{
-        return dev->reg_state == IB_DEV_REGISTERED;
-}
-
 static ssize_t port_attr_show(struct kobject *kobj,
                               struct attribute *attr, char *buf)
 {
@@ -80,8 +75,6 @@ static ssize_t port_attr_show(struct kobject *kobj,
 
         if (!port_attr->show)
                 return -EIO;
-        if (!ibdev_is_alive(p->ibdev))
-                return -ENODEV;
 
         return port_attr->show(p, port_attr, buf);
 }
@@ -562,9 +555,6 @@ static ssize_t show_node_type(struct device *device,
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
 
-        if (!ibdev_is_alive(dev))
-                return -ENODEV;
-
         switch (dev->node_type) {
         case RDMA_NODE_IB_CA:     return sprintf(buf, "%d: CA\n", dev->node_type);
         case RDMA_NODE_RNIC:      return sprintf(buf, "%d: RNIC\n", dev->node_type);
@@ -581,9 +571,6 @@ static ssize_t show_sys_image_guid(struct device *device,
         struct ib_device_attr attr;
         ssize_t ret;
 
-        if (!ibdev_is_alive(dev))
-                return -ENODEV;
-
         ret = ib_query_device(dev, &attr);
         if (ret)
                 return ret;
@@ -600,9 +587,6 @@ static ssize_t show_node_guid(struct device *device,
 {
         struct ib_device *dev = container_of(device, struct ib_device, dev);
 
-        if (!ibdev_is_alive(dev))
-                return -ENODEV;
-
         return sprintf(buf, "%04x:%04x:%04x:%04x\n",
                        be16_to_cpu(((__be16 *) &dev->node_guid)[0]),
                        be16_to_cpu(((__be16 *) &dev->node_guid)[1]),
@@ -848,6 +832,9 @@ void ib_device_unregister_sysfs(struct ib_device *device)
         struct kobject *p, *t;
         struct ib_port *port;
 
+        /* Hold kobject until ib_dealloc_device() */
+        kobject_get(&device->dev.kobj);
+
         list_for_each_entry_safe(p, t, &device->port_list, entry) {
                 list_del(&p->entry);
                 port = container_of(p, struct ib_port, kobj);