PM: sleep: Use dev_printk() when possible

[ Upstream commit eb23d91af55bc2369fe3f0aa6997e72eb20e16fe ]

Use dev_printk() when possible to make messages more consistent with other
device-related messages.

Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 7839d0078e0d ("PM: sleep: Fix possible deadlocks in core system-wide PM code")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 1dbaaddf540e162c9147fd6bd24b8f2de9a7b506..a4714a0253158edeedf0cfe642f56980cfefb8f5 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -16,6 +16,7 @@
  */
 
 #define pr_fmt(fmt) "PM: " fmt
+#define dev_fmt pr_fmt
 
 #include <linux/device.h>
 #include <linux/export.h>
@@ -449,8 +450,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)
 {
-       pr_err("Device %s failed to %s%s: error %d\n",
-              dev_name(dev), pm_verb(state.event), info, error);
+       dev_err(dev, "failed to %s%s: error %d\n", pm_verb(state.event), info,
+               error);
 }
 
 static void dpm_show_time(ktime_t starttime, pm_message_t state, int error,
@@ -1898,8 +1899,8 @@ int dpm_prepare(pm_message_t state)
                                error = 0;
                                continue;
                        }
-                       pr_info("Device %s not prepared for power transition: code %d\n",
-                               dev_name(dev), error);
+                       dev_info(dev, "not prepared for power transition: code %d\n",
+                                error);
                        put_device(dev);
                        break;
                }