From 42d11a7a7659cd4a1e08f5ed35578446270518b6 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 2 Jul 2010 00:14:57 +0200 Subject: [PATCH] --- yaml --- r: 209512 b: refs/heads/master c: 618d7fd0d4e51a45d25d9bc6097a0cb1e5a2f226 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/sleep.c | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 7dcc3b82b56c..601724722f31 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5f7a1bb65bca03253c189e946b3ca79669f08af +refs/heads/master: 618d7fd0d4e51a45d25d9bc6097a0cb1e5a2f226 diff --git a/trunk/drivers/acpi/sleep.c b/trunk/drivers/acpi/sleep.c index 61c5bd03f733..5529c7023956 100644 --- a/trunk/drivers/acpi/sleep.c +++ b/trunk/drivers/acpi/sleep.c @@ -290,11 +290,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state) return ACPI_SUCCESS(status) ? 0 : -EFAULT; } -static void acpi_suspend_finish(void) -{ - acpi_pm_finish(); -} - static int acpi_suspend_state_valid(suspend_state_t pm_state) { u32 acpi_state; @@ -316,7 +311,7 @@ static struct platform_suspend_ops acpi_suspend_ops = { .begin = acpi_suspend_begin, .prepare_late = acpi_pm_prepare, .enter = acpi_suspend_enter, - .wake = acpi_suspend_finish, + .wake = acpi_pm_finish, .end = acpi_pm_end, }; @@ -344,7 +339,7 @@ static struct platform_suspend_ops acpi_suspend_ops_old = { .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_pre_suspend, .enter = acpi_suspend_enter, - .wake = acpi_suspend_finish, + .wake = acpi_pm_finish, .end = acpi_pm_end, .recover = acpi_pm_finish, };