mirror of
https://github.com/adulau/aha.git
synced 2024-12-27 03:06:10 +00:00
tc: struct device - replace bus_id with dev_name(), dev_set_name()
Cc: macro@linux-mips.org Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
This commit is contained in:
parent
1692713ee9
commit
df388556d7
1 changed files with 4 additions and 4 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue