]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ieee1394: struct device - replace bus_id with dev_name(), dev_set_name()
authorKay Sievers <kay.sievers@vrfy.org>
Thu, 30 Oct 2008 00:49:20 +0000 (01:49 +0100)
committerStefan Richter <stefanr@s5r6.in-berlin.de>
Fri, 31 Oct 2008 07:48:25 +0000 (08:48 +0100)
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
drivers/ieee1394/hosts.c
drivers/ieee1394/nodemgr.c

index 8dd09d8504196eecbe750887ec23f702667b105d..237d0c9d69c6cdd945a8de007e2a29485ec0f1ac 100644 (file)
@@ -155,11 +155,11 @@ struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra,
        memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));
        h->device.parent = dev;
        set_dev_node(&h->device, dev_to_node(dev));
-       snprintf(h->device.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
+       dev_set_name(&h->device, "fw-host%d", h->id);
 
        h->host_dev.parent = &h->device;
        h->host_dev.class = &hpsb_host_class;
-       snprintf(h->host_dev.bus_id, BUS_ID_SIZE, "fw-host%d", h->id);
+       dev_set_name(&h->host_dev, "fw-host%d", h->id);
 
        if (device_register(&h->device))
                goto fail;
index 2376b729e8765c5ca85bb7f1e0acf7201fe3b227..9e39f73282ee6dd439e76647af5ab5c4755e711a 100644 (file)
@@ -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));
 }