nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

ACPI / sleep: Drop redundant acpi_disabled check

Browse source 
acpi_sleep_init() is only called from acpi_bus_init() and the
code logic shows that it doesn't need to check acpi_disabled:

acpi_init();
	if (acpi_disabled) return;
	acpi_bus_init();
		acpi_sleep_init();
			if (acpi_disabled)
				return 0;

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hanjun Guo 2013-12-06 00:03:41 +08:00 committed by Rafael J. Wysocki
parent 4ef54410ca
commit 100eb0b042
1 changed files with 0 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/acpi/sleep.c
View file

@ -802,9 +802,6 @@ int __init acpi_sleep_init(void)
char *pos = supported; char *pos = supported;
int i; int i;
if (acpi_disabled)
return 0;
acpi_sleep_dmi_check(); acpi_sleep_dmi_check();
sleep_states[ACPI_STATE_S0] = 1; sleep_states[ACPI_STATE_S0] = 1;