UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ACPI: nvs: Unify the message printing 

The message printing in nvs.c is mixed with pr_*() and
printk(), but with no prefix and also no pr_fmt() defined.

Introduce pr_fmt() and use pr_*() macros to replace printk(),
to generate a unified format string for prefix.

Signed-off-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hanjun Guo 2021-06-02 16:54:28 +08:00 committed by Rafael J. Wysocki
parent e2935abb3a
commit 4f59927d5d
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/acpi/nvs.c
View File

@ -5,6 +5,8 @@
* Copyright (C) 2008-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc. * Copyright (C) 2008-2011 Rafael J. Wysocki <rjw@sisk.pl>, Novell Inc.
*/ */
#define pr_fmt(fmt) "ACPI: PM: " fmt
#include <linux/io.h> #include <linux/io.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/list.h> #include <linux/list.h>
@ -94,7 +96,7 @@ static int suspend_nvs_register(unsigned long start, unsigned long size)
{ {
struct nvs_page *entry, *next; struct nvs_page *entry, *next;
pr_info("PM: Registering ACPI NVS region [mem %#010lx-%#010lx] (%ld bytes)\n", pr_info("Registering ACPI NVS region [mem %#010lx-%#010lx] (%ld bytes)\n",
start, start + size - 1, size); start, start + size - 1, size);
while (size > 0) { while (size > 0) {
@ -170,7 +172,7 @@ int suspend_nvs_save(void)
{ {
struct nvs_page *entry; struct nvs_page *entry;
printk(KERN_INFO "PM: Saving platform NVS memory\n"); pr_info("Saving platform NVS memory\n");
list_for_each_entry(entry, &nvs_list, node) list_for_each_entry(entry, &nvs_list, node)
if (entry->data) { if (entry->data) {
@ -202,7 +204,7 @@ void suspend_nvs_restore(void)
{ {
struct nvs_page *entry; struct nvs_page *entry;
printk(KERN_INFO "PM: Restoring platform NVS memory\n"); pr_info("Restoring platform NVS memory\n");
list_for_each_entry(entry, &nvs_list, node) list_for_each_entry(entry, &nvs_list, node)
if (entry->data) if (entry->data)