[Linaro-acpi] [PATCH 2/2] ACPI / sleep: Remove the redundant if (acpi_disabled) check

acpi_sleep_init() will only be called in acpi_bus_init(), and the code logic shows that if (acpi_disabled) is redundant:

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 --- drivers/acpi/sleep.c | 3 --- 1 file changed, 3 deletions(-)

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 208ac8c..54ab266 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -802,9 +802,6 @@ int __init acpi_sleep_init(void) char *pos = supported; int i;

- if (acpi_disabled) - return 0; - acpi_sleep_dmi_check();

sleep_states[ACPI_STATE_S0] = 1;