ACPI / PM: Consolidate suspend-specific and hibernate-specific code
Move some suspend-specific and hibernate-specific code from acpi_sleep_init() into separate functions to get rid of explicit #ifdefs in acpi_sleep_init(). Use pr_info() to start and pr_cont() to continue printing the supported ACPI sleep states line. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Родитель
9ce4e60711
Коммит
02040f0bba
|
@ -579,7 +579,28 @@ static const struct platform_suspend_ops acpi_suspend_ops_old = {
|
||||||
.end = acpi_pm_end,
|
.end = acpi_pm_end,
|
||||||
.recover = acpi_pm_finish,
|
.recover = acpi_pm_finish,
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_SUSPEND */
|
|
||||||
|
static void acpi_sleep_suspend_setup(void)
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) {
|
||||||
|
acpi_status status;
|
||||||
|
u8 type_a, type_b;
|
||||||
|
|
||||||
|
status = acpi_get_sleep_type_data(i, &type_a, &type_b);
|
||||||
|
if (ACPI_SUCCESS(status)) {
|
||||||
|
sleep_states[i] = 1;
|
||||||
|
pr_cont(" S%d", i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend_set_ops(old_suspend_ordering ?
|
||||||
|
&acpi_suspend_ops_old : &acpi_suspend_ops);
|
||||||
|
}
|
||||||
|
#else /* !CONFIG_SUSPEND */
|
||||||
|
static inline void acpi_sleep_suspend_setup(void) {}
|
||||||
|
#endif /* !CONFIG_SUSPEND */
|
||||||
|
|
||||||
#ifdef CONFIG_HIBERNATION
|
#ifdef CONFIG_HIBERNATION
|
||||||
static unsigned long s4_hardware_signature;
|
static unsigned long s4_hardware_signature;
|
||||||
|
@ -700,7 +721,30 @@ static const struct platform_hibernation_ops acpi_hibernation_ops_old = {
|
||||||
.restore_cleanup = acpi_pm_thaw,
|
.restore_cleanup = acpi_pm_thaw,
|
||||||
.recover = acpi_pm_finish,
|
.recover = acpi_pm_finish,
|
||||||
};
|
};
|
||||||
#endif /* CONFIG_HIBERNATION */
|
|
||||||
|
static void acpi_sleep_hibernate_setup(void)
|
||||||
|
{
|
||||||
|
acpi_status status;
|
||||||
|
u8 type_a, type_b;
|
||||||
|
|
||||||
|
status = acpi_get_sleep_type_data(ACPI_STATE_S4, &type_a, &type_b);
|
||||||
|
if (ACPI_FAILURE(status))
|
||||||
|
return;
|
||||||
|
|
||||||
|
hibernation_set_ops(old_suspend_ordering ?
|
||||||
|
&acpi_hibernation_ops_old : &acpi_hibernation_ops);
|
||||||
|
sleep_states[ACPI_STATE_S4] = 1;
|
||||||
|
pr_cont(KERN_CONT " S4");
|
||||||
|
if (nosigcheck)
|
||||||
|
return;
|
||||||
|
|
||||||
|
acpi_get_table(ACPI_SIG_FACS, 1, (struct acpi_table_header **)&facs);
|
||||||
|
if (facs)
|
||||||
|
s4_hardware_signature = facs->hardware_signature;
|
||||||
|
}
|
||||||
|
#else /* !CONFIG_HIBERNATION */
|
||||||
|
static inline void acpi_sleep_hibernate_setup(void) {}
|
||||||
|
#endif /* !CONFIG_HIBERNATION */
|
||||||
|
|
||||||
int acpi_suspend(u32 acpi_state)
|
int acpi_suspend(u32 acpi_state)
|
||||||
{
|
{
|
||||||
|
@ -736,9 +780,6 @@ int __init acpi_sleep_init(void)
|
||||||
{
|
{
|
||||||
acpi_status status;
|
acpi_status status;
|
||||||
u8 type_a, type_b;
|
u8 type_a, type_b;
|
||||||
#ifdef CONFIG_SUSPEND
|
|
||||||
int i = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (acpi_disabled)
|
if (acpi_disabled)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -746,45 +787,19 @@ int __init acpi_sleep_init(void)
|
||||||
acpi_sleep_dmi_check();
|
acpi_sleep_dmi_check();
|
||||||
|
|
||||||
sleep_states[ACPI_STATE_S0] = 1;
|
sleep_states[ACPI_STATE_S0] = 1;
|
||||||
printk(KERN_INFO PREFIX "(supports S0");
|
pr_info(PREFIX "(supports S0");
|
||||||
|
|
||||||
#ifdef CONFIG_SUSPEND
|
acpi_sleep_suspend_setup();
|
||||||
for (i = ACPI_STATE_S1; i < ACPI_STATE_S4; i++) {
|
acpi_sleep_hibernate_setup();
|
||||||
status = acpi_get_sleep_type_data(i, &type_a, &type_b);
|
|
||||||
if (ACPI_SUCCESS(status)) {
|
|
||||||
sleep_states[i] = 1;
|
|
||||||
printk(KERN_CONT " S%d", i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend_set_ops(old_suspend_ordering ?
|
|
||||||
&acpi_suspend_ops_old : &acpi_suspend_ops);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef CONFIG_HIBERNATION
|
|
||||||
status = acpi_get_sleep_type_data(ACPI_STATE_S4, &type_a, &type_b);
|
|
||||||
if (ACPI_SUCCESS(status)) {
|
|
||||||
hibernation_set_ops(old_suspend_ordering ?
|
|
||||||
&acpi_hibernation_ops_old : &acpi_hibernation_ops);
|
|
||||||
sleep_states[ACPI_STATE_S4] = 1;
|
|
||||||
printk(KERN_CONT " S4");
|
|
||||||
if (!nosigcheck) {
|
|
||||||
acpi_get_table(ACPI_SIG_FACS, 1,
|
|
||||||
(struct acpi_table_header **)&facs);
|
|
||||||
if (facs)
|
|
||||||
s4_hardware_signature =
|
|
||||||
facs->hardware_signature;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
|
status = acpi_get_sleep_type_data(ACPI_STATE_S5, &type_a, &type_b);
|
||||||
if (ACPI_SUCCESS(status)) {
|
if (ACPI_SUCCESS(status)) {
|
||||||
sleep_states[ACPI_STATE_S5] = 1;
|
sleep_states[ACPI_STATE_S5] = 1;
|
||||||
printk(KERN_CONT " S5");
|
pr_cont(" S5");
|
||||||
pm_power_off_prepare = acpi_power_off_prepare;
|
pm_power_off_prepare = acpi_power_off_prepare;
|
||||||
pm_power_off = acpi_power_off;
|
pm_power_off = acpi_power_off;
|
||||||
}
|
}
|
||||||
printk(KERN_CONT ")\n");
|
pr_cont(")\n");
|
||||||
/*
|
/*
|
||||||
* Register the tts_notifier to reboot notifier list so that the _TTS
|
* Register the tts_notifier to reboot notifier list so that the _TTS
|
||||||
* object can also be evaluated when the system enters S5.
|
* object can also be evaluated when the system enters S5.
|
||||||
|
|
Загрузка…
Ссылка в новой задаче