1 files changed, 5 insertions, 9 deletions

diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 2376b729e876..9e39f73282ee 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -826,13 +826,11 @@ static struct node_entry *nodemgr_create_node(octlet_t guid,
         memcpy(&ne->device, &nodemgr_dev_template_ne,
                sizeof(ne->device));
         ne->device.parent = &host->device;
-        snprintf(ne->device.bus_id, BUS_ID_SIZE, "%016Lx",
-                 (unsigned long long)(ne->guid));
+        dev_set_name(&ne->device, "%016Lx", (unsigned long long)(ne->guid));
 
         ne->node_dev.parent = &ne->device;
         ne->node_dev.class = &nodemgr_ne_class;
-        snprintf(ne->node_dev.bus_id, BUS_ID_SIZE, "%016Lx",
-                (unsigned long long)(ne->guid));
+        dev_set_name(&ne->node_dev, "%016Lx", (unsigned long long)(ne->guid));
 
         if (device_register(&ne->device))
                 goto fail_devreg;
@@ -932,13 +930,11 @@ static void nodemgr_register_device(struct node_entry *ne,
 
         ud->device.parent = parent;
 
-        snprintf(ud->device.bus_id, BUS_ID_SIZE, "%s-%u",
-                 ne->device.bus_id, ud->id);
+        dev_set_name(&ud->device, "%s-%u", dev_name(&ne->device), ud->id);
 
         ud->unit_dev.parent = &ud->device;
         ud->unit_dev.class = &nodemgr_ud_class;
-        snprintf(ud->unit_dev.bus_id, BUS_ID_SIZE, "%s-%u",
-                 ne->device.bus_id, ud->id);
+        dev_set_name(&ud->unit_dev, "%s-%u", dev_name(&ne->device), ud->id);
 
         if (device_register(&ud->device))
                 goto fail_devreg;
@@ -953,7 +949,7 @@ static void nodemgr_register_device(struct node_entry *ne,
 fail_classdevreg:
         device_unregister(&ud->device);
 fail_devreg:
-        HPSB_ERR("Failed to create unit %s", ud->device.bus_id);
+        HPSB_ERR("Failed to create unit %s", dev_name(&ud->device));
 }