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

Commit df388556 authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman
Browse files

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



Cc: macro@linux-mips.org
Acked-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
parent 1692713e

drivers/tc/tc.c

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus) 
			       slot);

			goto out_err;

		}

		sprintf(tdev->dev.bus_id, "tc%x", slot);

		dev_set_name(&tdev->dev, "tc%x", slot);

		tdev->bus = tbus;

		tdev->dev.parent = &tbus->dev;

		tdev->dev.bus = &tc_bus_type;
@@ -104,7 +104,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus) 
		tdev->vendor[8] = 0;

		tdev->name[8] = 0;



		pr_info("%s: %s %s %s\n", tdev->dev.bus_id, tdev->vendor,

		pr_info("%s: %s %s %s\n", dev_name(&tdev->dev), tdev->vendor,

			tdev->name, tdev->firmware);



		devsize = readb(module + offset + TC_SLOT_SIZE);
@@ -118,7 +118,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus) 
		} else {

			printk(KERN_ERR "%s: Cannot provide slot space "

			       "(%dMiB required, up to %dMiB supported)\n",

			       tdev->dev.bus_id, devsize >> 20,

			       dev_name(&tdev->dev), devsize >> 20,

			       max(slotsize, extslotsize) >> 20);

			kfree(tdev);

			goto out_err;
@@ -146,7 +146,7 @@ static int __init tc_init(void) 
		return 0;



	INIT_LIST_HEAD(&tc_bus.devices);

	strcpy(tc_bus.dev.bus_id, "tc");

	dev_set_name(&tc_bus.dev, "tc");

	device_register(&tc_bus.dev);



	if (tc_bus.info.slot_size) {