diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-21 08:50:48 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-24 17:57:46 -0400 |
commit | 142bce74fd141913b2127970a9bd90f33c5b7653 (patch) | |
tree | 96a0e43cf7fa4806474f28e21844a9cee13ca229 | |
parent | bebcdae3ec13b2171ff91594787ab37b3fdb3306 (diff) |
PM / suspend: Define pr_fmt() in suspend.c
Define a common prefix ("PM:") for messages printed by the
code in kernel/power/suspend.c.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
-rw-r--r-- | kernel/power/suspend.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index a3d270e2e313..4bce46ddc2cd 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -8,6 +8,8 @@ | |||
8 | * This file is released under the GPLv2. | 8 | * This file is released under the GPLv2. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #define pr_fmt(fmt) "PM: " fmt | ||
12 | |||
11 | #include <linux/string.h> | 13 | #include <linux/string.h> |
12 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
13 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
@@ -391,7 +393,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) | |||
391 | 393 | ||
392 | error = dpm_suspend_late(PMSG_SUSPEND); | 394 | error = dpm_suspend_late(PMSG_SUSPEND); |
393 | if (error) { | 395 | if (error) { |
394 | pr_err("PM: late suspend of devices failed\n"); | 396 | pr_err("late suspend of devices failed\n"); |
395 | goto Platform_finish; | 397 | goto Platform_finish; |
396 | } | 398 | } |
397 | error = platform_suspend_prepare_late(state); | 399 | error = platform_suspend_prepare_late(state); |
@@ -405,7 +407,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) | |||
405 | 407 | ||
406 | error = dpm_suspend_noirq(PMSG_SUSPEND); | 408 | error = dpm_suspend_noirq(PMSG_SUSPEND); |
407 | if (error) { | 409 | if (error) { |
408 | pr_err("PM: noirq suspend of devices failed\n"); | 410 | pr_err("noirq suspend of devices failed\n"); |
409 | goto Platform_early_resume; | 411 | goto Platform_early_resume; |
410 | } | 412 | } |
411 | error = platform_suspend_prepare_noirq(state); | 413 | error = platform_suspend_prepare_noirq(state); |
@@ -481,7 +483,7 @@ int suspend_devices_and_enter(suspend_state_t state) | |||
481 | suspend_test_start(); | 483 | suspend_test_start(); |
482 | error = dpm_suspend_start(PMSG_SUSPEND); | 484 | error = dpm_suspend_start(PMSG_SUSPEND); |
483 | if (error) { | 485 | if (error) { |
484 | pr_err("PM: Some devices failed to suspend, or early wake event detected\n"); | 486 | pr_err("Some devices failed to suspend, or early wake event detected\n"); |
485 | goto Recover_platform; | 487 | goto Recover_platform; |
486 | } | 488 | } |
487 | suspend_test_finish("suspend devices"); | 489 | suspend_test_finish("suspend devices"); |
@@ -539,7 +541,7 @@ static int enter_state(suspend_state_t state) | |||
539 | if (state == PM_SUSPEND_FREEZE) { | 541 | if (state == PM_SUSPEND_FREEZE) { |
540 | #ifdef CONFIG_PM_DEBUG | 542 | #ifdef CONFIG_PM_DEBUG |
541 | if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) { | 543 | if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) { |
542 | pr_warn("PM: Unsupported test mode for suspend to idle, please choose none/freezer/devices/platform.\n"); | 544 | pr_warn("Unsupported test mode for suspend to idle, please choose none/freezer/devices/platform.\n"); |
543 | return -EAGAIN; | 545 | return -EAGAIN; |
544 | } | 546 | } |
545 | #endif | 547 | #endif |
@@ -554,7 +556,7 @@ static int enter_state(suspend_state_t state) | |||
554 | 556 | ||
555 | #ifndef CONFIG_SUSPEND_SKIP_SYNC | 557 | #ifndef CONFIG_SUSPEND_SKIP_SYNC |
556 | trace_suspend_resume(TPS("sync_filesystems"), 0, true); | 558 | trace_suspend_resume(TPS("sync_filesystems"), 0, true); |
557 | pr_info("PM: Syncing filesystems ... "); | 559 | pr_info("Syncing filesystems ... "); |
558 | sys_sync(); | 560 | sys_sync(); |
559 | pr_cont("done.\n"); | 561 | pr_cont("done.\n"); |
560 | trace_suspend_resume(TPS("sync_filesystems"), 0, false); | 562 | trace_suspend_resume(TPS("sync_filesystems"), 0, false); |
@@ -597,7 +599,7 @@ int pm_suspend(suspend_state_t state) | |||
597 | if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) | 599 | if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) |
598 | return -EINVAL; | 600 | return -EINVAL; |
599 | 601 | ||
600 | pr_info("PM: suspend entry (%s)\n", mem_sleep_labels[state]); | 602 | pr_info("suspend entry (%s)\n", mem_sleep_labels[state]); |
601 | error = enter_state(state); | 603 | error = enter_state(state); |
602 | if (error) { | 604 | if (error) { |
603 | suspend_stats.fail++; | 605 | suspend_stats.fail++; |
@@ -605,7 +607,7 @@ int pm_suspend(suspend_state_t state) | |||
605 | } else { | 607 | } else { |
606 | suspend_stats.success++; | 608 | suspend_stats.success++; |
607 | } | 609 | } |
608 | pr_info("PM: suspend exit\n"); | 610 | pr_info("suspend exit\n"); |
609 | return error; | 611 | return error; |
610 | } | 612 | } |
611 | EXPORT_SYMBOL(pm_suspend); | 613 | EXPORT_SYMBOL(pm_suspend); |