mirror of
https://github.com/adulau/aha.git
synced 2024-12-28 11:46:19 +00:00
device create: infiniband: convert device_create_drvdata to device_create
Now that device_create() has been audited, rename things back to the original call to be sane. Cc: Roland Dreier <rolandd@cisco.com> Cc: Sean Hefty <sean.hefty@intel.com> Cc: Hal Rosenstock <hal.rosenstock@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
6229df31b9
commit
91bd418fdc
4 changed files with 13 additions and 16 deletions
|
@ -3691,9 +3691,9 @@ static void cm_add_one(struct ib_device *ib_device)
|
|||
cm_dev->ib_device = ib_device;
|
||||
cm_get_ack_delay(cm_dev);
|
||||
|
||||
cm_dev->device = device_create_drvdata(&cm_class, &ib_device->dev,
|
||||
MKDEV(0, 0), NULL,
|
||||
"%s", ib_device->name);
|
||||
cm_dev->device = device_create(&cm_class, &ib_device->dev,
|
||||
MKDEV(0, 0), NULL,
|
||||
"%s", ib_device->name);
|
||||
if (!cm_dev->device) {
|
||||
kfree(cm_dev);
|
||||
return;
|
||||
|
|
|
@ -1016,9 +1016,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_drvdata(umad_class, device->dma_device,
|
||||
port->cdev->dev, port,
|
||||
"umad%d", port->dev_num);
|
||||
port->dev = device_create(umad_class, device->dma_device,
|
||||
port->cdev->dev, port,
|
||||
"umad%d", port->dev_num);
|
||||
if (IS_ERR(port->dev))
|
||||
goto err_cdev;
|
||||
|
||||
|
@ -1036,9 +1036,9 @@ 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_drvdata(umad_class, device->dma_device,
|
||||
port->sm_cdev->dev, port,
|
||||
"issm%d", port->dev_num);
|
||||
port->sm_dev = device_create(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;
|
||||
|
||||
|
|
|
@ -764,12 +764,9 @@ 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_drvdata(uverbs_class,
|
||||
device->dma_device,
|
||||
uverbs_dev->cdev->dev,
|
||||
uverbs_dev,
|
||||
"uverbs%d",
|
||||
uverbs_dev->devnum);
|
||||
uverbs_dev->dev = device_create(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;
|
||||
|
||||
|
|
|
@ -2455,7 +2455,7 @@ static int init_cdev(int minor, char *name, const struct file_operations *fops,
|
|||
goto err_cdev;
|
||||
}
|
||||
|
||||
device = device_create_drvdata(ipath_class, NULL, dev, NULL, name);
|
||||
device = device_create(ipath_class, NULL, dev, NULL, name);
|
||||
|
||||
if (IS_ERR(device)) {
|
||||
ret = PTR_ERR(device);
|
||||
|
|
Loading…
Reference in a new issue