diff options
| -rw-r--r-- | drivers/acpi/sleep.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 61c5bd03f733..5529c7023956 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c | |||
| @@ -290,11 +290,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state) | |||
| 290 | return ACPI_SUCCESS(status) ? 0 : -EFAULT; | 290 | return ACPI_SUCCESS(status) ? 0 : -EFAULT; |
| 291 | } | 291 | } |
| 292 | 292 | ||
| 293 | static void acpi_suspend_finish(void) | ||
| 294 | { | ||
| 295 | acpi_pm_finish(); | ||
| 296 | } | ||
| 297 | |||
| 298 | static int acpi_suspend_state_valid(suspend_state_t pm_state) | 293 | static int acpi_suspend_state_valid(suspend_state_t pm_state) |
| 299 | { | 294 | { |
| 300 | u32 acpi_state; | 295 | u32 acpi_state; |
| @@ -316,7 +311,7 @@ static struct platform_suspend_ops acpi_suspend_ops = { | |||
| 316 | .begin = acpi_suspend_begin, | 311 | .begin = acpi_suspend_begin, |
| 317 | .prepare_late = acpi_pm_prepare, | 312 | .prepare_late = acpi_pm_prepare, |
| 318 | .enter = acpi_suspend_enter, | 313 | .enter = acpi_suspend_enter, |
| 319 | .wake = acpi_suspend_finish, | 314 | .wake = acpi_pm_finish, |
| 320 | .end = acpi_pm_end, | 315 | .end = acpi_pm_end, |
| 321 | }; | 316 | }; |
| 322 | 317 | ||
| @@ -344,7 +339,7 @@ static struct platform_suspend_ops acpi_suspend_ops_old = { | |||
| 344 | .begin = acpi_suspend_begin_old, | 339 | .begin = acpi_suspend_begin_old, |
| 345 | .prepare_late = acpi_pm_pre_suspend, | 340 | .prepare_late = acpi_pm_pre_suspend, |
| 346 | .enter = acpi_suspend_enter, | 341 | .enter = acpi_suspend_enter, |
| 347 | .wake = acpi_suspend_finish, | 342 | .wake = acpi_pm_finish, |
| 348 | .end = acpi_pm_end, | 343 | .end = acpi_pm_end, |
| 349 | .recover = acpi_pm_finish, | 344 | .recover = acpi_pm_finish, |
| 350 | }; | 345 | }; |
