Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 233976e5 authored by Kay Sievers's avatar Kay Sievers Committed by Stefan Richter
Browse files

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



Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarStefan Richter <stefanr@s5r6.in-berlin.de>
parent a1f64819

drivers/ieee1394/hosts.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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));

	memcpy(&h->device, &nodemgr_dev_template_host, sizeof(h->device));

	h->device.parent = dev;

	h->device.parent = dev;

	set_dev_node(&h->device, dev_to_node(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.parent = &h->device;

	h->host_dev.class = &hpsb_host_class;

	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))

	if (device_register(&h->device))

		goto fail;

		goto fail;

drivers/ieee1394/nodemgr.c

+5 −9
Original line number Original line Diff line number Diff line
@@ -826,13 +826,11 @@ static struct node_entry *nodemgr_create_node(octlet_t guid, 
	memcpy(&ne->device, &nodemgr_dev_template_ne,

	memcpy(&ne->device, &nodemgr_dev_template_ne,

	       sizeof(ne->device));

	       sizeof(ne->device));

	ne->device.parent = &host->device;

	ne->device.parent = &host->device;

	snprintf(ne->device.bus_id, BUS_ID_SIZE, "%016Lx",

	dev_set_name(&ne->device, "%016Lx", (unsigned long long)(ne->guid));

		 (unsigned long long)(ne->guid));





	ne->node_dev.parent = &ne->device;

	ne->node_dev.parent = &ne->device;

	ne->node_dev.class = &nodemgr_ne_class;

	ne->node_dev.class = &nodemgr_ne_class;

	snprintf(ne->node_dev.bus_id, BUS_ID_SIZE, "%016Lx",

	dev_set_name(&ne->node_dev, "%016Lx", (unsigned long long)(ne->guid));

		(unsigned long long)(ne->guid));





	if (device_register(&ne->device))

	if (device_register(&ne->device))

		goto fail_devreg;

		goto fail_devreg;
@@ -932,13 +930,11 @@ static void nodemgr_register_device(struct node_entry *ne, 




	ud->device.parent = parent;

	ud->device.parent = parent;





	snprintf(ud->device.bus_id, BUS_ID_SIZE, "%s-%u",

	dev_set_name(&ud->device, "%s-%u", dev_name(&ne->device), ud->id);

		 ne->device.bus_id, ud->id);





	ud->unit_dev.parent = &ud->device;

	ud->unit_dev.parent = &ud->device;

	ud->unit_dev.class = &nodemgr_ud_class;

	ud->unit_dev.class = &nodemgr_ud_class;

	snprintf(ud->unit_dev.bus_id, BUS_ID_SIZE, "%s-%u",

	dev_set_name(&ud->unit_dev, "%s-%u", dev_name(&ne->device), ud->id);

		 ne->device.bus_id, ud->id);





	if (device_register(&ud->device))

	if (device_register(&ud->device))

		goto fail_devreg;

		goto fail_devreg;
@@ -953,7 +949,7 @@ static void nodemgr_register_device(struct node_entry *ne, 
fail_classdevreg:

fail_classdevreg:

	device_unregister(&ud->device);

	device_unregister(&ud->device);

fail_devreg:

fail_devreg:

	HPSB_ERR("Failed to create unit %s", ud->device.bus_id);

	HPSB_ERR("Failed to create unit %s", dev_name(&ud->device));

}	

}