Commit d927e38c authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman

infiniband: struct device - replace bus_id with dev_name(), dev_set_name()

Acked-by: default avatarRoland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0162f382
...@@ -778,7 +778,7 @@ int ib_device_register_sysfs(struct ib_device *device) ...@@ -778,7 +778,7 @@ int ib_device_register_sysfs(struct ib_device *device)
class_dev->class = &ib_class; class_dev->class = &ib_class;
class_dev->driver_data = device; class_dev->driver_data = device;
class_dev->parent = device->dma_device; class_dev->parent = device->dma_device;
strlcpy(class_dev->bus_id, device->name, BUS_ID_SIZE); dev_set_name(class_dev, device->name);
INIT_LIST_HEAD(&device->port_list); INIT_LIST_HEAD(&device->port_list);
......
...@@ -1266,8 +1266,7 @@ static void ib_ucm_add_one(struct ib_device *device) ...@@ -1266,8 +1266,7 @@ static void ib_ucm_add_one(struct ib_device *device)
ucm_dev->dev.parent = device->dma_device; ucm_dev->dev.parent = device->dma_device;
ucm_dev->dev.devt = ucm_dev->cdev.dev; ucm_dev->dev.devt = ucm_dev->cdev.dev;
ucm_dev->dev.release = ib_ucm_release_dev; ucm_dev->dev.release = ib_ucm_release_dev;
snprintf(ucm_dev->dev.bus_id, BUS_ID_SIZE, "ucm%d", dev_set_name(&ucm_dev->dev, "ucm%d", ucm_dev->devnum);
ucm_dev->devnum);
if (device_register(&ucm_dev->dev)) if (device_register(&ucm_dev->dev))
goto err_cdev; goto err_cdev;
......
...@@ -1949,8 +1949,7 @@ static struct srp_host *srp_add_port(struct srp_device *device, u8 port) ...@@ -1949,8 +1949,7 @@ static struct srp_host *srp_add_port(struct srp_device *device, u8 port)
host->dev.class = &srp_class; host->dev.class = &srp_class;
host->dev.parent = device->dev->dma_device; host->dev.parent = device->dev->dma_device;
snprintf(host->dev.bus_id, BUS_ID_SIZE, "srp-%s-%d", dev_set_name(&host->dev, "srp-%s-%d", device->dev->name, port);
device->dev->name, port);
if (device_register(&host->dev)) if (device_register(&host->dev))
goto free_host; goto free_host;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment