diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/tc/tc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c index f77f62a4b325..e5bd4470a570 100644 --- 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) | |||
86 | slot); | 86 | slot); |
87 | goto out_err; | 87 | goto out_err; |
88 | } | 88 | } |
89 | sprintf(tdev->dev.bus_id, "tc%x", slot); | 89 | dev_set_name(&tdev->dev, "tc%x", slot); |
90 | tdev->bus = tbus; | 90 | tdev->bus = tbus; |
91 | tdev->dev.parent = &tbus->dev; | 91 | tdev->dev.parent = &tbus->dev; |
92 | tdev->dev.bus = &tc_bus_type; | 92 | tdev->dev.bus = &tc_bus_type; |
@@ -104,7 +104,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus) | |||
104 | tdev->vendor[8] = 0; | 104 | tdev->vendor[8] = 0; |
105 | tdev->name[8] = 0; | 105 | tdev->name[8] = 0; |
106 | 106 | ||
107 | pr_info("%s: %s %s %s\n", tdev->dev.bus_id, tdev->vendor, | 107 | pr_info("%s: %s %s %s\n", dev_name(&tdev->dev), tdev->vendor, |
108 | tdev->name, tdev->firmware); | 108 | tdev->name, tdev->firmware); |
109 | 109 | ||
110 | devsize = readb(module + offset + TC_SLOT_SIZE); | 110 | devsize = readb(module + offset + TC_SLOT_SIZE); |
@@ -118,7 +118,7 @@ static void __init tc_bus_add_devices(struct tc_bus *tbus) | |||
118 | } else { | 118 | } else { |
119 | printk(KERN_ERR "%s: Cannot provide slot space " | 119 | printk(KERN_ERR "%s: Cannot provide slot space " |
120 | "(%dMiB required, up to %dMiB supported)\n", | 120 | "(%dMiB required, up to %dMiB supported)\n", |
121 | tdev->dev.bus_id, devsize >> 20, | 121 | dev_name(&tdev->dev), devsize >> 20, |
122 | max(slotsize, extslotsize) >> 20); | 122 | max(slotsize, extslotsize) >> 20); |
123 | kfree(tdev); | 123 | kfree(tdev); |
124 | goto out_err; | 124 | goto out_err; |
@@ -146,7 +146,7 @@ static int __init tc_init(void) | |||
146 | return 0; | 146 | return 0; |
147 | 147 | ||
148 | INIT_LIST_HEAD(&tc_bus.devices); | 148 | INIT_LIST_HEAD(&tc_bus.devices); |
149 | strcpy(tc_bus.dev.bus_id, "tc"); | 149 | dev_set_name(&tc_bus.dev, "tc"); |
150 | device_register(&tc_bus.dev); | 150 | device_register(&tc_bus.dev); |
151 | 151 | ||
152 | if (tc_bus.info.slot_size) { | 152 | if (tc_bus.info.slot_size) { |