if (cdev_add(port->dev, base_dev + port->dev_num, 1))
                goto err_cdev;
 
-       port->class_dev = class_device_create(umad_class, port->dev->dev,
+       port->class_dev = class_device_create(umad_class, NULL, port->dev->dev,
                                              device->dma_device,
                                              "umad%d", port->dev_num);
        if (IS_ERR(port->class_dev))
        if (cdev_add(port->sm_dev, base_dev + port->dev_num + IB_UMAD_MAX_PORTS, 1))
                goto err_sm_cdev;
 
-       port->sm_class_dev = class_device_create(umad_class, port->sm_dev->dev,
+       port->sm_class_dev = class_device_create(umad_class, NULL, port->sm_dev->dev,
                                                 device->dma_device,
                                                 "issm%d", port->dev_num);
        if (IS_ERR(port->sm_class_dev))
 
        if (cdev_add(uverbs_dev->dev, IB_UVERBS_BASE_DEV + uverbs_dev->devnum, 1))
                goto err_cdev;
 
-       uverbs_dev->class_dev = class_device_create(uverbs_class, uverbs_dev->dev->dev,
+       uverbs_dev->class_dev = class_device_create(uverbs_class, NULL,
+                                                   uverbs_dev->dev->dev,
                                                    device->dma_device,
                                                    "uverbs%d", uverbs_dev->devnum);
        if (IS_ERR(uverbs_dev->class_dev))