1 files changed, 43 insertions, 48 deletions

diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index 823beca448e1..16e5f714ca53 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -169,20 +169,16 @@ int uverbs_dealloc_mw(struct ib_mw *mw)
         return ret;
 }
 
-static void ib_uverbs_release_dev(struct kobject *kobj)
+static void ib_uverbs_release_dev(struct device *device)
 {
         struct ib_uverbs_device *dev =
-                container_of(kobj, struct ib_uverbs_device, kobj);
+                        container_of(device, struct ib_uverbs_device, dev);
 
         uverbs_destroy_api(dev->uapi);
         cleanup_srcu_struct(&dev->disassociate_srcu);
         kfree(dev);
 }
 
-static struct kobj_type ib_uverbs_dev_ktype = {
-        .release = ib_uverbs_release_dev,
-};
-
 static void ib_uverbs_release_async_event_file(struct kref *ref)
 {
         struct ib_uverbs_async_event_file *file =
@@ -265,7 +261,7 @@ void ib_uverbs_release_file(struct kref *ref)
         if (atomic_dec_and_test(&file->device->refcount))
                 ib_uverbs_comp_dev(file->device);
 
-        kobject_put(&file->device->kobj);
+        put_device(&file->device->dev);
         kfree(file);
 }
 
@@ -838,6 +834,7 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
         if (!atomic_inc_not_zero(&dev->refcount))
                 return -ENXIO;
 
+        get_device(&dev->dev);
         srcu_key = srcu_read_lock(&dev->disassociate_srcu);
         mutex_lock(&dev->lists_mutex);
         ib_dev = srcu_dereference(dev->ib_dev,
@@ -877,7 +874,6 @@ static int ib_uverbs_open(struct inode *inode, struct file *filp)
         init_rwsem(&file->hw_destroy_rwsem);
 
         filp->private_data = file;
-        kobject_get(&dev->kobj);
         list_add_tail(&file->list, &dev->uverbs_file_list);
         mutex_unlock(&dev->lists_mutex);
         srcu_read_unlock(&dev->disassociate_srcu, srcu_key);
@@ -898,6 +894,7 @@ err:
         if (atomic_dec_and_test(&dev->refcount))
                 ib_uverbs_comp_dev(dev);
 
+        put_device(&dev->dev);
         return ret;
 }
 
@@ -950,17 +947,15 @@ static struct ib_client uverbs_client = {
         .remove = ib_uverbs_remove_one
 };
 
-static ssize_t show_ibdev(struct device *device, struct device_attribute *attr,
+static ssize_t ibdev_show(struct device *device, struct device_attribute *attr,
                           char *buf)
 {
+        struct ib_uverbs_device *dev =
+                        container_of(device, struct ib_uverbs_device, dev);
         int ret = -ENODEV;
         int srcu_key;
-        struct ib_uverbs_device *dev = dev_get_drvdata(device);
         struct ib_device *ib_dev;
 
-        if (!dev)
-                return -ENODEV;
-
         srcu_key = srcu_read_lock(&dev->disassociate_srcu);
         ib_dev = srcu_dereference(dev->ib_dev, &dev->disassociate_srcu);
         if (ib_dev)
@@ -969,18 +964,17 @@ static ssize_t show_ibdev(struct device *device, struct device_attribute *attr,
 
         return ret;
 }
-static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);
+static DEVICE_ATTR_RO(ibdev);
 
-static ssize_t show_dev_abi_version(struct device *device,
-                                    struct device_attribute *attr, char *buf)
+static ssize_t abi_version_show(struct device *device,
+                                struct device_attribute *attr, char *buf)
 {
-        struct ib_uverbs_device *dev = dev_get_drvdata(device);
+        struct ib_uverbs_device *dev =
+                        container_of(device, struct ib_uverbs_device, dev);
         int ret = -ENODEV;
         int srcu_key;
         struct ib_device *ib_dev;
 
-        if (!dev)
-                return -ENODEV;
         srcu_key = srcu_read_lock(&dev->disassociate_srcu);
         ib_dev = srcu_dereference(dev->ib_dev, &dev->disassociate_srcu);
         if (ib_dev)
@@ -989,7 +983,17 @@ static ssize_t show_dev_abi_version(struct device *device,
 
         return ret;
 }
-static DEVICE_ATTR(abi_version, S_IRUGO, show_dev_abi_version, NULL);
+static DEVICE_ATTR_RO(abi_version);
+
+static struct attribute *ib_dev_attrs[] = {
+        &dev_attr_abi_version.attr,
+        &dev_attr_ibdev.attr,
+        NULL,
+};
+
+static const struct attribute_group dev_attr_group = {
+        .attrs = ib_dev_attrs,
+};
 
 static CLASS_ATTR_STRING(abi_version, S_IRUGO,
                          __stringify(IB_USER_VERBS_ABI_VERSION));
@@ -1031,7 +1035,6 @@ static void ib_uverbs_add_one(struct ib_device *device)
         init_completion(&uverbs_dev->comp);
         uverbs_dev->xrcd_tree = RB_ROOT;
         mutex_init(&uverbs_dev->xrcd_tree_mutex);
-        kobject_init(&uverbs_dev->kobj, &ib_uverbs_dev_ktype);
         mutex_init(&uverbs_dev->lists_mutex);
         INIT_LIST_HEAD(&uverbs_dev->uverbs_file_list);
         INIT_LIST_HEAD(&uverbs_dev->uverbs_events_file_list);
@@ -1050,43 +1053,37 @@ static void ib_uverbs_add_one(struct ib_device *device)
         uverbs_dev->num_comp_vectors = device->num_comp_vectors;
 
         if (ib_uverbs_create_uapi(device, uverbs_dev))
-                goto err;
-
-        cdev_init(&uverbs_dev->cdev, NULL);
+                goto err_uapi;
+
+        device_initialize(&uverbs_dev->dev);
+        uverbs_dev->dev.class = uverbs_class;
+        uverbs_dev->dev.parent = device->dev.parent;
+        uverbs_dev->dev.devt = base;
+        uverbs_dev->dev.release = ib_uverbs_release_dev;
+        uverbs_dev->groups[0] = &dev_attr_group;
+        uverbs_dev->dev.groups = uverbs_dev->groups;
+        dev_set_name(&uverbs_dev->dev, "uverbs%d", uverbs_dev->devnum);
+
+        cdev_init(&uverbs_dev->cdev,
+                  device->mmap ? &uverbs_mmap_fops : &uverbs_fops);
         uverbs_dev->cdev.owner = THIS_MODULE;
-        uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops;
-        cdev_set_parent(&uverbs_dev->cdev, &uverbs_dev->kobj);
-        kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum);
-        if (cdev_add(&uverbs_dev->cdev, base, 1))
-                goto err_cdev;
 
-        uverbs_dev->dev = device_create(uverbs_class, device->dev.parent,
-                                        uverbs_dev->cdev.dev, uverbs_dev,
-                                        "uverbs%d", uverbs_dev->devnum);
-        if (IS_ERR(uverbs_dev->dev))
+        ret = cdev_device_add(&uverbs_dev->cdev, &uverbs_dev->dev);
+        if (ret)
                 goto err_cdev;
 
-        if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev))
-                goto err_class;
-        if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version))
-                goto err_class;
-
         ib_set_client_data(device, &uverbs_client, uverbs_dev);
-
         return;
 
-err_class:
-        device_destroy(uverbs_class, uverbs_dev->cdev.dev);
-
 err_cdev:
         cdev_del(&uverbs_dev->cdev);
+        put_device(&uverbs_dev->dev);
+err_uapi:
         clear_bit(devnum, dev_map);
-
 err:
         if (atomic_dec_and_test(&uverbs_dev->refcount))
                 ib_uverbs_comp_dev(uverbs_dev);
         wait_for_completion(&uverbs_dev->comp);
-        kobject_put(&uverbs_dev->kobj);
         return;
 }
 
@@ -1156,9 +1153,7 @@ static void ib_uverbs_remove_one(struct ib_device *device, void *client_data)
         if (!uverbs_dev)
                 return;
 
-        dev_set_drvdata(uverbs_dev->dev, NULL);
-        device_destroy(uverbs_class, uverbs_dev->cdev.dev);
-        cdev_del(&uverbs_dev->cdev);
+        cdev_device_del(&uverbs_dev->cdev, &uverbs_dev->dev);
         clear_bit(uverbs_dev->devnum, dev_map);
 
         if (device->disassociate_ucontext) {
@@ -1182,7 +1177,7 @@ static void ib_uverbs_remove_one(struct ib_device *device, void *client_data)
         if (wait_clients)
                 wait_for_completion(&uverbs_dev->comp);
 
-        kobject_put(&uverbs_dev->kobj);
+        put_device(&uverbs_dev->dev);
 }
 
 static char *uverbs_devnode(struct device *dev, umode_t *mode)