4 files changed, 23 insertions, 16 deletions

diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 2c334c01fc43..764e0f28979e 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c
@@ -6,6 +6,8 @@
  * This file is released under the GPLv2.
  */
 
+#define pr_fmt(fmt) "PM: " fmt
+
 #include <linux/delay.h>
 #include <linux/kernel.h>
 #include <linux/io.h>
@@ -1657,8 +1659,8 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd,
         genpd_lock_nested(genpd, SINGLE_DEPTH_NESTING);
 
         if (!list_empty(&subdomain->master_links) || subdomain->device_count) {
-                pr_warn("%s: unable to remove subdomain %s\n", genpd->name,
-                        subdomain->name);
+                pr_warn("%s: unable to remove subdomain %s\n",
+                        genpd->name, subdomain->name);
                 ret = -EBUSY;
                 goto out;
         }
@@ -1767,7 +1769,7 @@ int pm_genpd_init(struct generic_pm_domain *genpd,
                 if (ret)
                         return ret;
         } else if (!gov) {
-                pr_warn("%s : no governor for states\n", genpd->name);
+                pr_warn("%s: no governor for states\n", genpd->name);
         }
 
         device_initialize(&genpd->dev);
@@ -2514,7 +2516,7 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state,
                                                 &entry_latency);
         if (err) {
                 pr_debug(" * %pOF missing entry-latency-us property\n",
-                                                state_node);
+                         state_node);
                 return -EINVAL;
         }
 
@@ -2522,7 +2524,7 @@ static int genpd_parse_state(struct genpd_power_state *genpd_state,
                                                 &exit_latency);
         if (err) {
                 pr_debug(" * %pOF missing exit-latency-us property\n",
-                                                state_node);
+                         state_node);
                 return -EINVAL;
         }
 
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 893ae464bfd6..929bc9d50db7 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -17,6 +17,8 @@
  * subsystem list maintains.
  */
 
+#define pr_fmt(fmt) "PM: " fmt
+
 #include <linux/device.h>
 #include <linux/export.h>
 #include <linux/mutex.h>
@@ -128,7 +130,7 @@ void device_pm_add(struct device *dev)
         if (device_pm_not_required(dev))
                 return;
 
-        pr_debug("PM: Adding info for %s:%s\n",
+        pr_debug("Adding info for %s:%s\n",
                  dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
         device_pm_check_callbacks(dev);
         mutex_lock(&dpm_list_mtx);
@@ -149,7 +151,7 @@ void device_pm_remove(struct device *dev)
         if (device_pm_not_required(dev))
                 return;
 
-        pr_debug("PM: Removing info for %s:%s\n",
+        pr_debug("Removing info for %s:%s\n",
                  dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
         complete_all(&dev->power.completion);
         mutex_lock(&dpm_list_mtx);
@@ -168,7 +170,7 @@ void device_pm_remove(struct device *dev)
  */
 void device_pm_move_before(struct device *deva, struct device *devb)
 {
-        pr_debug("PM: Moving %s:%s before %s:%s\n",
+        pr_debug("Moving %s:%s before %s:%s\n",
                  deva->bus ? deva->bus->name : "No Bus", dev_name(deva),
                  devb->bus ? devb->bus->name : "No Bus", dev_name(devb));
         /* Delete deva from dpm_list and reinsert before devb. */
@@ -182,7 +184,7 @@ void device_pm_move_before(struct device *deva, struct device *devb)
  */
 void device_pm_move_after(struct device *deva, struct device *devb)
 {
-        pr_debug("PM: Moving %s:%s after %s:%s\n",
+        pr_debug("Moving %s:%s after %s:%s\n",
                  deva->bus ? deva->bus->name : "No Bus", dev_name(deva),
                  devb->bus ? devb->bus->name : "No Bus", dev_name(devb));
         /* Delete deva from dpm_list and reinsert after devb. */
@@ -195,7 +197,7 @@ void device_pm_move_after(struct device *deva, struct device *devb)
  */
 void device_pm_move_last(struct device *dev)
 {
-        pr_debug("PM: Moving %s:%s to end of list\n",
+        pr_debug("Moving %s:%s to end of list\n",
                  dev->bus ? dev->bus->name : "No Bus", dev_name(dev));
         list_move_tail(&dev->power.entry, &dpm_list);
 }
@@ -418,8 +420,8 @@ static void pm_dev_dbg(struct device *dev, pm_message_t state, const char *info)
 static void pm_dev_err(struct device *dev, pm_message_t state, const char *info,
                         int error)
 {
-        printk(KERN_ERR "PM: Device %s failed to %s%s: error %d\n",
-                dev_name(dev), pm_verb(state.event), info, error);
+        pr_err("Device %s failed to %s%s: error %d\n",
+               dev_name(dev), pm_verb(state.event), info, error);
 }
 
 static void dpm_show_time(ktime_t starttime, pm_message_t state, int error,
@@ -2022,8 +2024,7 @@ int dpm_prepare(pm_message_t state)
                                 error = 0;
                                 continue;
                         }
-                        printk(KERN_INFO "PM: Device %s not prepared "
-                                "for power transition: code %d\n",
+                        pr_info("Device %s not prepared for power transition: code %d\n",
                                 dev_name(dev), error);
                         put_device(dev);
                         break;
@@ -2062,7 +2063,7 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start);
 void __suspend_report_result(const char *function, void *fn, int ret)
 {
         if (ret)
-                printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret);
+                pr_err("%s(): %pF returns %d\n", function, fn, ret);
 }
 EXPORT_SYMBOL_GPL(__suspend_report_result);
 
diff --git a/drivers/base/power/trace.c b/drivers/base/power/trace.c
index b11f47a1e819..2bd9d2c744ca 100644
--- a/drivers/base/power/trace.c
+++ b/drivers/base/power/trace.c
@@ -7,6 +7,8 @@
  * devices may be working.
  */
 
+#define pr_fmt(fmt) "PM: " fmt
+
 #include <linux/pm-trace.h>
 #include <linux/export.h>
 #include <linux/rtc.h>
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
index f1fee72ed970..d0e77d56c1d9 100644
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
@@ -6,6 +6,8 @@
  * This file is released under the GPLv2.
  */
 
+#define pr_fmt(fmt) "PM: " fmt
+
 #include <linux/device.h>
 #include <linux/slab.h>
 #include <linux/sched/signal.h>
@@ -853,7 +855,7 @@ bool pm_wakeup_pending(void)
         raw_spin_unlock_irqrestore(&events_lock, flags);
 
         if (ret) {
-                pr_debug("PM: Wakeup pending, aborting suspend\n");
+                pr_debug("Wakeup pending, aborting suspend\n");
                 pm_print_active_wakeup_sources();
         }