diff options
Diffstat (limited to 'drivers/sbus/sbus.c')
-rw-r--r-- | drivers/sbus/sbus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/sbus/sbus.c b/drivers/sbus/sbus.c index c37d7c2587ff..73a86d09bba8 100644 --- a/drivers/sbus/sbus.c +++ b/drivers/sbus/sbus.c | |||
@@ -78,7 +78,7 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde | |||
78 | else | 78 | else |
79 | sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev; | 79 | sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev; |
80 | sdev->ofdev.dev.bus = &sbus_bus_type; | 80 | sdev->ofdev.dev.bus = &sbus_bus_type; |
81 | sprintf(sdev->ofdev.dev.bus_id, "sbus[%08x]", dp->node); | 81 | dev_set_name(&sdev->ofdev.dev, "sbus[%08x]", dp->node); |
82 | 82 | ||
83 | if (of_device_register(&sdev->ofdev) != 0) | 83 | if (of_device_register(&sdev->ofdev) != 0) |
84 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", | 84 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", |
@@ -257,11 +257,11 @@ static void __init build_one_sbus(struct device_node *dp, int num_sbus) | |||
257 | sbus->ofdev.node = dp; | 257 | sbus->ofdev.node = dp; |
258 | sbus->ofdev.dev.parent = NULL; | 258 | sbus->ofdev.dev.parent = NULL; |
259 | sbus->ofdev.dev.bus = &sbus_bus_type; | 259 | sbus->ofdev.dev.bus = &sbus_bus_type; |
260 | sprintf(sbus->ofdev.dev.bus_id, "sbus%d", num_sbus); | 260 | dev_set_name(&sbus->ofdev.dev, "sbus%d", num_sbus); |
261 | 261 | ||
262 | if (of_device_register(&sbus->ofdev) != 0) | 262 | if (of_device_register(&sbus->ofdev) != 0) |
263 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", | 263 | printk(KERN_DEBUG "sbus: device registration error for %s!\n", |
264 | sbus->ofdev.dev.bus_id); | 264 | dev_name(&sbus->ofdev.dev)); |
265 | 265 | ||
266 | dev_dp = dp->child; | 266 | dev_dp = dp->child; |
267 | while (dev_dp) { | 267 | while (dev_dp) { |