lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem()

Browse Source 
The function do_suspend_lowlevel() is specific to x86 and defined in
assembly code, so it should be called from the x86 low-level suspend
code rather than from acpi_suspend_enter().

Merge do_suspend_lowlevel() into the x86's acpi_save_state_mem() and
change the name of the latter to acpi_suspend_lowlevel(), so that the
function's purpose is better reflected by its name.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki
2011-02-08 23:42:22 +01:00
parent 979f11b060
commit f1a2003e22
6 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/acpi/sleep.c
View File

@@ -199,8 +199,6 @@ static void acpi_pm_end(void)
#endif /* CONFIG_ACPI_SLEEP */
#ifdef CONFIG_SUSPEND
extern void do_suspend_lowlevel(void);
static u32 acpi_suspend_states[] = {
[PM_SUSPEND_ON] = ACPI_STATE_S0,
[PM_SUSPEND_STANDBY] = ACPI_STATE_S1,
@@ -255,10 +253,9 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
break;
case ACPI_STATE_S3:
error = acpi_save_state_mem();
error = acpi_suspend_lowlevel();
if (error)
return error;
do_suspend_lowlevel();
pr_info(PREFIX "Low-level resume complete\n");
break;
}