korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-15 16:24:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

PM / suspend: Use mem_sleep_labels[] strings in messages

Browse Source 
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>
This commit is contained in:
Rafael J. Wysocki 2017-07-21 14:49:51 +02:00
parent e516a1db43
commit bebcdae3ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/power/suspend.c
View File

@ -560,7 +560,7 @@ static int enter_state(suspend_state_t state)
trace_suspend_resume(TPS("sync_filesystems"), 0, false); trace_suspend_resume(TPS("sync_filesystems"), 0, false);
#endif #endif
pm_pr_dbg("Preparing system for sleep (%s)\n", pm_states[state]); pm_pr_dbg("Preparing system for sleep (%s)\n", mem_sleep_labels[state]);
pm_suspend_clear_flags(); pm_suspend_clear_flags();
error = suspend_prepare(state); error = suspend_prepare(state);
if (error) if (error)
@ -570,7 +570,7 @@ static int enter_state(suspend_state_t state)
goto Finish; goto Finish;
trace_suspend_resume(TPS("suspend_enter"), state, false); trace_suspend_resume(TPS("suspend_enter"), state, false);
pm_pr_dbg("Suspending system (%s)\n", pm_states[state]); pm_pr_dbg("Suspending system (%s)\n", mem_sleep_labels[state]);
pm_restrict_gfp_mask(); pm_restrict_gfp_mask();
error = suspend_devices_and_enter(state); error = suspend_devices_and_enter(state);
pm_restore_gfp_mask(); pm_restore_gfp_mask();
@ -597,7 +597,7 @@ int pm_suspend(suspend_state_t state)
if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX) if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
return -EINVAL; return -EINVAL;
pr_info("PM: suspend entry (%s)\n", pm_states[state]); pr_info("PM: suspend entry (%s)\n", mem_sleep_labels[state]);
error = enter_state(state); error = enter_state(state);
if (error) { if (error) {
suspend_stats.fail++; suspend_stats.fail++;