summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKay Sievers2008-11-13 08:48:40 +0100
committerDavid S. Miller2008-11-13 08:48:40 +0100
commit5acdc1fa2d9614ecd301f3d27f19bfeabe811ade (patch)
treeb6d58f48ebecb5e9a38f1325e6f50d8fe2c7f76f
parentsparc64: Update defconfig. (diff)
downloadkernel-qcow2-linux-5acdc1fa2d9614ecd301f3d27f19bfeabe811ade.tar.gz
kernel-qcow2-linux-5acdc1fa2d9614ecd301f3d27f19bfeabe811ade.tar.xz
kernel-qcow2-linux-5acdc1fa2d9614ecd301f3d27f19bfeabe811ade.zip
sparc: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/kernel/of_device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/of_device.c b/arch/sparc/kernel/of_device.c
index 0837bd52e28f..0a83bd737654 100644
--- a/arch/sparc/kernel/of_device.c
+++ b/arch/sparc/kernel/of_device.c
@@ -563,9 +563,9 @@ build_resources:
op->dev.parent = parent;
op->dev.bus = &of_platform_bus_type;
if (!parent)
- strcpy(op->dev.bus_id, "root");
+ dev_set_name(&op->dev, "root");
else
- sprintf(op->dev.bus_id, "%08x", dp->node);
+ dev_set_name(&op->dev, "%08x", dp->node);
if (of_device_register(op)) {
printk("%s: Could not register of device.\n",