mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 19:51:31 -04:00
sparc64: fix up bus_id changes in sparc core code
This converts all instances of bus_id in the sparc core kernel to use either dev_set_name(), or dev_name() depending on the need. This is done in anticipation of removing the bus_id field from struct driver. Cc: Kay Sievers <[email protected]> Acked-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
361d5ee3c0
commit
2222c313e9
5 changed files with 15 additions and 17 deletions
|
|
@ -78,7 +78,7 @@ static void __init fill_sbus_device(struct device_node *dp, struct sbus_dev *sde
|
|||
else
|
||||
sdev->ofdev.dev.parent = &sdev->bus->ofdev.dev;
|
||||
sdev->ofdev.dev.bus = &sbus_bus_type;
|
||||
sprintf(sdev->ofdev.dev.bus_id, "sbus[%08x]", dp->node);
|
||||
dev_set_name(&sdev->ofdev.dev, "sbus[%08x]", dp->node);
|
||||
|
||||
if (of_device_register(&sdev->ofdev) != 0)
|
||||
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)
|
|||
sbus->ofdev.node = dp;
|
||||
sbus->ofdev.dev.parent = NULL;
|
||||
sbus->ofdev.dev.bus = &sbus_bus_type;
|
||||
sprintf(sbus->ofdev.dev.bus_id, "sbus%d", num_sbus);
|
||||
dev_set_name(&sbus->ofdev.dev, "sbus%d", num_sbus);
|
||||
|
||||
if (of_device_register(&sbus->ofdev) != 0)
|
||||
printk(KERN_DEBUG "sbus: device registration error for %s!\n",
|
||||
sbus->ofdev.dev.bus_id);
|
||||
dev_name(&sbus->ofdev.dev));
|
||||
|
||||
dev_dp = dp->child;
|
||||
while (dev_dp) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue