2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index a8e4dcbcaf7a..670c9d6c1407 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -76,7 +76,7 @@ void device_pm_add(struct device *dev)
         if (dev->parent) {
                 if (dev->parent->power.status >= DPM_SUSPENDING)
                         dev_warn(dev, "parent %s should not be sleeping\n",
-                                dev->parent->bus_id);
+                                 dev_name(dev->parent));
         } else if (transition_started) {
                 /*
                  * We refuse to register parentless devices while a PM
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index 2aa6e8fc4def..0a1a2c4dbc6e 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -140,7 +140,7 @@ static unsigned int hash_string(unsigned int seed, const char *data, unsigned in
 
 void set_trace_device(struct device *dev)
 {
-        dev_hash_value = hash_string(DEVSEED, dev->bus_id, DEVHASH);
+        dev_hash_value = hash_string(DEVSEED, dev_name(dev), DEVHASH);
 }
 EXPORT_SYMBOL(set_trace_device);
 
@@ -192,7 +192,7 @@ static int show_dev_hash(unsigned int value)
 
         while (entry != &dpm_list) {
                 struct device * dev = to_device(entry);
-                unsigned int hash = hash_string(DEVSEED, dev->bus_id, DEVHASH);
+                unsigned int hash = hash_string(DEVSEED, dev_name(dev), DEVHASH);
                 if (hash == value) {
                         dev_info(dev, "hash matches\n");
                         match++;