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

Commit 5acdc1fa authored by Kay Sievers's avatar Kay Sievers Committed by David S. Miller
Browse files

sparc: 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 avatarDavid S. Miller <davem@davemloft.net>
parent 12de512a

arch/sparc/kernel/of_device.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -563,9 +563,9 @@ static struct of_device * __init scan_one_device(struct device_node *dp, 
	op->dev.parent = parent;

	op->dev.parent = parent;

	op->dev.bus = &of_platform_bus_type;

	op->dev.bus = &of_platform_bus_type;

	if (!parent)

	if (!parent)

		strcpy(op->dev.bus_id, "root");

		dev_set_name(&op->dev, "root");

	else

	else

		sprintf(op->dev.bus_id, "%08x", dp->node);

		dev_set_name(&op->dev, "%08x", dp->node);





	if (of_device_register(op)) {

	if (of_device_register(op)) {

		printk("%s: Could not register of device.\n",

		printk("%s: Could not register of device.\n",