projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into cpumask-for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
tc
/
tc.c
diff --git
a/drivers/tc/tc.c
b/drivers/tc/tc.c
index f77f62a4b325d3bb3c898efe42d397a17238114a..e5bd4470a570a4d45fcd7ef97d6a93c0a90aa601 100644
(file)
--- a/
drivers/tc/tc.c
+++ b/
drivers/tc/tc.c
@@
-86,7
+86,7
@@
static void __init tc_bus_add_devices(struct tc_bus *tbus)
slot);
goto out_err;
}
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;
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;
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);
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",
} 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;
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);
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) {
device_register(&tc_bus.dev);
if (tc_bus.info.slot_size) {