adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-27 19:26:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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:
Kay Sievers 2009-03-24 16:38:22 -07:00 committed by Greg Kroah-Hartman
parent 1692713ee9
commit df388556d7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/tc/tc.c
View file

@ -86,7 +86,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
slot); slot);
goto out_err; goto out_err;
} }
sprintf(tdev->dev.bus_id, "tc%x", slot); dev_set_name(&tdev->dev, "tc%x", slot);
tdev->bus = tbus; tdev->bus = tbus;
tdev->dev.parent = &tbus->dev; tdev->dev.parent = &tbus->dev;
tdev->dev.bus = &tc_bus_type; 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->vendor[8] = 0;
tdev->name[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); tdev->name, tdev->firmware);
devsize = readb(module + offset + TC_SLOT_SIZE); devsize = readb(module + offset + TC_SLOT_SIZE);
@ -118,7 +118,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus)
} else { } else {
printk(KERN_ERR "%s: Cannot provide slot space " printk(KERN_ERR "%s: Cannot provide slot space "
"(%dMiB required, up to %dMiB supported)\n", "(%dMiB required, up to %dMiB supported)\n",
tdev->dev.bus_id, devsize >> 20, dev_name(&tdev->dev), devsize >> 20,
max(slotsize, extslotsize) >> 20); max(slotsize, extslotsize) >> 20);
kfree(tdev); kfree(tdev);
goto out_err; goto out_err;
@ -146,7 +146,7 @@ static int __init tc_init(void)
return 0; return 0;
INIT_LIST_HEAD(&tc_bus.devices); 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); device_register(&tc_bus.dev);
if (tc_bus.info.slot_size) { if (tc_bus.info.slot_size) {