summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rjw@sisk.pl>2010-07-02 00:14:57 +0200
committerLen Brown <len.brown@intel.com>2010-07-06 22:14:30 -0400
commit618d7fd0d4e51a45d25d9bc6097a0cb1e5a2f226 (patch)
tree8b22ef526ecf1c8a092a1ddd03933b7dec34a62a /drivers/acpi
parentc5f7a1bb65bca03253c189e946b3ca79669f08af (diff)
downloadop-kernel-dev-618d7fd0d4e51a45d25d9bc6097a0cb1e5a2f226.zip
op-kernel-dev-618d7fd0d4e51a45d25d9bc6097a0cb1e5a2f226.tar.gz
ACPI / Sleep: Drop acpi_suspend_finish()
The function acpi_suspend_finish() is not necessary any more, because acpi_pm_finish() can be used instead of it just fine. Remove it. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/sleep.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 61c5bd0..5529c70 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)
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,
};
OpenPOWER on IntegriCloud