Skip to content

Commit

Permalink
ACPI / Sleep: Drop acpi_suspend_finish()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki authored and Len Brown committed Jul 7, 2010
1 parent c5f7a1b commit 618d7fd
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/acpi/sleep.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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,
};

Expand Down Expand Up @@ -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,
};
Expand Down

0 comments on commit 618d7fd

Please sign in to comment.