2 files changed, 12 insertions, 13 deletions

diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 3aa2db54eae4..840ede9ae965 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1005,8 +1005,9 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
         if (cdev_add(port->cdev, base_dev + port->dev_num, 1))
                 goto err_cdev;
 
-        port->dev = device_create(umad_class, device->dma_device,
-                                  port->cdev->dev, "umad%d", port->dev_num);
+        port->dev = device_create_drvdata(umad_class, device->dma_device,
+                                          port->cdev->dev, port,
+                                          "umad%d", port->dev_num);
         if (IS_ERR(port->dev))
                 goto err_cdev;
 
@@ -1024,15 +1025,12 @@ static int ib_umad_init_port(struct ib_device *device, int port_num,
         if (cdev_add(port->sm_cdev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
                 goto err_sm_cdev;
 
-        port->sm_dev = device_create(umad_class, device->dma_device,
-                                     port->sm_cdev->dev,
-                                     "issm%d", port->dev_num);
+        port->sm_dev = device_create_drvdata(umad_class, device->dma_device,
+                                             port->sm_cdev->dev, port,
+                                             "issm%d", port->dev_num);
         if (IS_ERR(port->sm_dev))
                 goto err_sm_cdev;
 
-        dev_set_drvdata(port->dev,    port);
-        dev_set_drvdata(port->sm_dev, port);
-
         if (device_create_file(port->sm_dev, &dev_attr_ibdev))
                 goto err_sm_dev;
         if (device_create_file(port->sm_dev, &dev_attr_port))
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c
index cc1afa28c181..f806da184b51 100644
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@@ -755,14 +755,15 @@ static void ib_uverbs_add_one(struct ib_device *device)
         if (cdev_add(uverbs_dev->cdev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
                 goto err_cdev;
 
-        uverbs_dev->dev = device_create(uverbs_class, device->dma_device,
-                                        uverbs_dev->cdev->dev,
-                                        "uverbs%d", uverbs_dev->devnum);
+        uverbs_dev->dev = device_create_drvdata(uverbs_class,
+                                                device->dma_device,
+                                                uverbs_dev->cdev->dev,
+                                                uverbs_dev,
+                                                "uverbs%d",
+                                                uverbs_dev->devnum);
         if (IS_ERR(uverbs_dev->dev))
                 goto err_cdev;
 
-        dev_set_drvdata(uverbs_dev->dev, uverbs_dev);
-
         if (device_create_file(uverbs_dev->dev, &dev_attr_ibdev))
                 goto err_class;
         if (device_create_file(uverbs_dev->dev, &dev_attr_abi_version))