From 98fc2ac0ea916b8596721e12e2e0664f3ad40560 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay.sievers@vrfy.org>
Date: Fri, 7 Nov 2008 01:42:46 +0100
Subject: [PATCH] --- yaml --- r: 119437 b: refs/heads/master c:
 90f671301a5e2678cdc99f611cd842161c3bb87f h: refs/heads/master i:   119435:
 b80e799dd874340dd08d6f06aa3fe629b2b76736 v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/parisc/include/asm/parisc-device.h | 4 ++--
 trunk/arch/parisc/kernel/drivers.c            | 6 ++++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 08d057e0d270..911d57408d7f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a3f5134a8f5bd7fa38b5645eef05e8a4eb62951
+refs/heads/master: 90f671301a5e2678cdc99f611cd842161c3bb87f
diff --git a/trunk/arch/parisc/include/asm/parisc-device.h b/trunk/arch/parisc/include/asm/parisc-device.h
index 7aa13f2add7a..9afdad6c2ffb 100644
--- a/trunk/arch/parisc/include/asm/parisc-device.h
+++ b/trunk/arch/parisc/include/asm/parisc-device.h
@@ -42,9 +42,9 @@ struct parisc_driver {
 #define to_parisc_driver(d)	container_of(d, struct parisc_driver, drv)
 #define parisc_parent(d)	to_parisc_device(d->dev.parent)
 
-static inline char *parisc_pathname(struct parisc_device *d)
+static inline const char *parisc_pathname(struct parisc_device *d)
 {
-	return d->dev.bus_id;
+	return dev_name(&d->dev);
 }
 
 static inline void
diff --git a/trunk/arch/parisc/kernel/drivers.c b/trunk/arch/parisc/kernel/drivers.c
index 2ca654bd6322..884b7ce16a3b 100644
--- a/trunk/arch/parisc/kernel/drivers.c
+++ b/trunk/arch/parisc/kernel/drivers.c
@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read_mostly;
 EXPORT_SYMBOL(hppa_dma_ops);
 
 static struct device root = {
-	.bus_id = "parisc",
+	.init_name = "parisc",
 };
 
 static inline int check_dev(struct device *dev)
@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath);
 static void setup_bus_id(struct parisc_device *padev)
 {
 	struct hardware_path path;
-	char *output = padev->dev.bus_id;
+	char name[20];
+	char *output = name;
 	int i;
 
 	get_node_path(padev->dev.parent, &path);
@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_device *padev)
 		output += sprintf(output, "%u:", (unsigned char) path.bc[i]);
 	}
 	sprintf(output, "%u", (unsigned char) padev->hw_path);
+	dev_set_name(&padev->dev, name);
 }
 
 struct parisc_device * create_tree_node(char id, struct device *parent)