diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-21 08:49:51 -0400 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-24 17:57:46 -0400 |
commit | bebcdae3ec13b2171ff91594787ab37b3fdb3306 (patch) | |
tree | 4739f619ba52c71e2c84cc5d980b7949c7322e20 | |
parent | e516a1db43cea397cf63d395534236d9869f0310 (diff) |
PM / suspend: Use mem_sleep_labels[] strings in messages
Some messages in suspend.c currently print state names from
pm_states[], but that may be confusing if the mem_sleep sysfs
attribute is changed to anything different from "mem", because
in those cases the messages will say either "freeze" or "standby"
after writing "mem" to /sys/power/state.
To avoid the confusion, use mem_sleep_labels[] strings in those
messages instead.
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 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 5cf232795318..a3d270e2e313 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
@@ -560,7 +560,7 @@ static int enter_state(suspend_state_t state) | |||
560 | trace_suspend_resume(TPS("sync_filesystems"), 0, false); | 560 | trace_suspend_resume(TPS("sync_filesystems"), 0, false); |
561 | #endif | 561 | #endif |
562 | 562 | ||
563 | pm_pr_dbg("Preparing system for sleep (%s)\n", pm_states[state]); | 563 | pm_pr_dbg("Preparing system for sleep (%s)\n", mem_sleep_labels[state]); |
564 | pm_suspend_clear_flags(); | 564 | pm_suspend_clear_flags(); |
565 | error = suspend_prepare(state); | 565 | error = suspend_prepare(state); |
566 | if (error) | 566 | if (error) |
@@ -570,7 +570,7 @@ static int enter_state(suspend_state_t state) | |||
570 | goto Finish; | 570 | goto Finish; |
571 | 571 | ||
572 | trace_suspend_resume(TPS("suspend_enter"), state, false); | 572 | trace_suspend_resume(TPS("suspend_enter"), state, false); |
573 | pm_pr_dbg("Suspending system (%s)\n", pm_states[state]); | 573 | pm_pr_dbg("Suspending system (%s)\n", mem_sleep_labels[state]); |
574 | pm_restrict_gfp_mask(); | 574 | pm_restrict_gfp_mask(); |
575 | error = suspend_devices_and_enter(state); | 575 | error = suspend_devices_and_enter(state); |
576 | pm_restore_gfp_mask(); | 576 | pm_restore_gfp_mask(); |
@@ -597,7 +597,7 @@ int pm_suspend(suspend_state_t state) | |||
597 | if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) | 597 | if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) |
598 | return -EINVAL; | 598 | return -EINVAL; |
599 | 599 | ||
600 | pr_info("PM: suspend entry (%s)\n", pm_states[state]); | 600 | pr_info("PM: suspend entry (%s)\n", mem_sleep_labels[state]); |
601 | error = enter_state(state); | 601 | error = enter_state(state); |
602 | if (error) { | 602 | if (error) { |
603 | suspend_stats.fail++; | 603 | suspend_stats.fail++; |