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

Acked-by: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 4f4d1bb9f069fa6a8f61c0027eb1f07c377d3664..b43f7d3682d387eb4de8bf3581a9499660cd97db 100644 (file)
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -778,7 +778,7 @@ int ib_device_register_sysfs(struct ib_device *device)
        class_dev->class      = &ib_class;
        class_dev->driver_data = 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);
 

diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c
index e603736682bfc6e52fbc6f4802375bd329aa7850..51bd9669cb1f7697c0be4e1b4b0c38dc4ee05499 100644 (file)
--- a/drivers/infiniband/core/ucm.c
+++ b/drivers/infiniband/core/ucm.c
@@ -1266,8 +1266,7 @@ static void ib_ucm_add_one(struct ib_device *device)
        ucm_dev->dev.parent = device->dma_device;
        ucm_dev->dev.devt = ucm_dev->cdev.dev;
        ucm_dev->dev.release = ib_ucm_release_dev;
-       snprintf(ucm_dev->dev.bus_id, BUS_ID_SIZE, "ucm%d",
-                ucm_dev->devnum);
+       dev_set_name(&ucm_dev->dev, "ucm%d", ucm_dev->devnum);
        if (device_register(&ucm_dev->dev))
                goto err_cdev;
 

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 7c13db885bf67defc836d8d60552865ff0041a62..54c8fe25c4236c07db75d8b0ab4b727cb84593b1 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1949,8 +1949,7 @@ static struct srp_host *srp_add_port(struct srp_device *device, u8 port)
 
        host->dev.class = &srp_class;
        host->dev.parent = device->dev->dma_device;
-       snprintf(host->dev.bus_id, BUS_ID_SIZE, "srp-%s-%d",
-                device->dev->name, port);
+       dev_set_name(&host->dev, "srp-%s-%d", device->dev->name, port);
 
        if (device_register(&host->dev))
                goto free_host;