diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-08 17:42:22 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-02-24 13:58:54 -0500 |
commit | f1a2003e22f6b50ea21f7f4b38b38c5ebc9c8017 (patch) | |
tree | 5317a7133739f2f352d2cde56213caeab5cf12ac /drivers/acpi | |
parent | 979f11b060c0b35b03b86ae854d6f21a710305d0 (diff) |
ACPI / PM: Merge do_suspend_lowlevel() into acpi_save_state_mem()
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>
Diffstat (limited to 'drivers/acpi')
-rw-r--r-- | drivers/acpi/sleep.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 2307604064b3..0a81bf11f473 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
@@ -199,8 +199,6 @@ static void acpi_pm_end(void) | |||
199 | #endif /* CONFIG_ACPI_SLEEP */ | 199 | #endif /* CONFIG_ACPI_SLEEP */ |
200 | 200 | ||
201 | #ifdef CONFIG_SUSPEND | 201 | #ifdef CONFIG_SUSPEND |
202 | extern void do_suspend_lowlevel(void); | ||
203 | |||
204 | static u32 acpi_suspend_states[] = { | 202 | static u32 acpi_suspend_states[] = { |
205 | [PM_SUSPEND_ON] = ACPI_STATE_S0, | 203 | [PM_SUSPEND_ON] = ACPI_STATE_S0, |
206 | [PM_SUSPEND_STANDBY] = ACPI_STATE_S1, | 204 | [PM_SUSPEND_STANDBY] = ACPI_STATE_S1, |
@@ -255,10 +253,9 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
255 | break; | 253 | break; |
256 | 254 | ||
257 | case ACPI_STATE_S3: | 255 | case ACPI_STATE_S3: |
258 | error = acpi_save_state_mem(); | 256 | error = acpi_suspend_lowlevel(); |
259 | if (error) | 257 | if (error) |
260 | return error; | 258 | return error; |
261 | do_suspend_lowlevel(); | ||
262 | pr_info(PREFIX "Low-level resume complete\n"); | 259 | pr_info(PREFIX "Low-level resume complete\n"); |
263 | break; | 260 | break; |
264 | } | 261 | } |