Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bebcdae3 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
parent e516a1db

kernel/power/suspend.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -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++;