Commit f2a5d7a9 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Yang Yingliang
Browse files

PM: sleep: Use dev_printk() when possible 

stable inclusion
from stable-v5.10.210
commit 2245a8498569fac4ad2e391f38862a859924cf3c
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I97NIA
CVE: CVE-2023-52498

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2245a8498569fac4ad2e391f38862a859924cf3c



--------------------------------

[ Upstream commit eb23d91a ]

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

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarRafael 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: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 1324bb78

drivers/base/power/main.c

+5 −4
Original line number Diff line number Diff line
@@ -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;

		}