Skip to contentSkip to conversation

PM: Use dev_printk() when possible

PATCH Applied Bjorn Helgaas 2 participants 2 messages Jan 27, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PM: Use dev_printk() when possible

From: Bjorn Helgaas <[email protected]>

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

---
 drivers/base/power/main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/base/power/main.c +5 -4
index 46793276598d..f893c3c5af07 100644
@@ -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,
@@ -1897,8 +1898,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;
 		}
Signature · 1 line
2.25.1
maintainer Applied
#1 lore raw
Quoted 36 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

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

---
 drivers/base/power/main.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/base/power/main.c +3 -2
index 46793276598d..f893c3c5af07 100644
@@ -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,
@@ -1897,8 +1898,8 @@ int dpm_prepare(pm_message_t state)
                                error = 0;

drivers/base/power/main.c int dpm_prepare(pm_message_t state)

Quoted 10 lines
drivers/base/power/main.c +2 -3
                                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;
                }
--

Applied as 5.12 material, thanks!