Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 618d7fd0 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent c5f7a1bb

drivers/acpi/sleep.c

+2 −7
Original line number Original line Diff line number Diff line
@@ -290,11 +290,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state) 
	return ACPI_SUCCESS(status) ? 0 : -EFAULT;

	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)

static int acpi_suspend_state_valid(suspend_state_t pm_state)

{

{

	u32 acpi_state;

	u32 acpi_state;
@@ -316,7 +311,7 @@ static struct platform_suspend_ops acpi_suspend_ops = { 
	.begin = acpi_suspend_begin,

	.begin = acpi_suspend_begin,

	.prepare_late = acpi_pm_prepare,

	.prepare_late = acpi_pm_prepare,

	.enter = acpi_suspend_enter,

	.enter = acpi_suspend_enter,

	.wake = acpi_suspend_finish,

	.wake = acpi_pm_finish,

	.end = acpi_pm_end,

	.end = acpi_pm_end,

};

};
@@ -344,7 +339,7 @@ static struct platform_suspend_ops acpi_suspend_ops_old = { 
	.begin = acpi_suspend_begin_old,

	.begin = acpi_suspend_begin_old,

	.prepare_late = acpi_pm_pre_suspend,

	.prepare_late = acpi_pm_pre_suspend,

	.enter = acpi_suspend_enter,

	.enter = acpi_suspend_enter,

	.wake = acpi_suspend_finish,

	.wake = acpi_pm_finish,

	.end = acpi_pm_end,

	.end = acpi_pm_end,

	.recover = acpi_pm_finish,

	.recover = acpi_pm_finish,

};

};