Commit a9215045 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

PM / sleep: Refine diagnostic messages in enter_state()

Some of the system suspend diagnostic messages related to
suspend-to-idle refer to it as "freeze sleep" or "freeze state"
while the others say "suspend-to-idle".  To reduce the possible
confusion that may result from that, refine the former either to
say "suspend to idle" too or to make it clearer that what is printed
is a state string written to /sys/power/state ("mem", "standby",
or "freeze").
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b6ec9452
...@@ -468,7 +468,7 @@ static int enter_state(suspend_state_t state) ...@@ -468,7 +468,7 @@ static int enter_state(suspend_state_t state)
if (state == PM_SUSPEND_FREEZE) { if (state == PM_SUSPEND_FREEZE) {
#ifdef CONFIG_PM_DEBUG #ifdef CONFIG_PM_DEBUG
if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) { if (pm_test_level != TEST_NONE && pm_test_level <= TEST_CPUS) {
pr_warning("PM: Unsupported test mode for freeze state," pr_warning("PM: Unsupported test mode for suspend to idle,"
"please choose none/freezer/devices/platform.\n"); "please choose none/freezer/devices/platform.\n");
return -EAGAIN; return -EAGAIN;
} }
...@@ -488,7 +488,7 @@ static int enter_state(suspend_state_t state) ...@@ -488,7 +488,7 @@ static int enter_state(suspend_state_t state)
printk("done.\n"); printk("done.\n");
trace_suspend_resume(TPS("sync_filesystems"), 0, false); trace_suspend_resume(TPS("sync_filesystems"), 0, false);
pr_debug("PM: Preparing system for %s sleep\n", pm_states[state]); pr_debug("PM: Preparing system for sleep (%s)\n", pm_states[state]);
error = suspend_prepare(state); error = suspend_prepare(state);
if (error) if (error)
goto Unlock; goto Unlock;
...@@ -497,7 +497,7 @@ static int enter_state(suspend_state_t state) ...@@ -497,7 +497,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);
pr_debug("PM: Entering %s sleep\n", pm_states[state]); pr_debug("PM: Suspending system (%s)\n", pm_states[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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment