diff options
| author | Hanjun Guo <hanjun.guo@linaro.org> | 2013-12-06 00:03:41 +0800 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-07 01:36:32 +0100 |
| commit | 100eb0b04293fbb7af689ff7ddfe8fc8a46ab65c (patch) | |
| tree | d54971c29b9b41c58e87861ff3f60109e0debcea /drivers/acpi/sleep.c | |
| parent | 4ef54410ca6e7e5f32d67c5fb8094ae07460814a (diff) | |
| download | linux-100eb0b04293fbb7af689ff7ddfe8fc8a46ab65c.tar.gz linux-100eb0b04293fbb7af689ff7ddfe8fc8a46ab65c.tar.bz2 linux-100eb0b04293fbb7af689ff7ddfe8fc8a46ab65c.zip | |
ACPI / sleep: Drop redundant acpi_disabled check
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>
Diffstat (limited to 'drivers/acpi/sleep.c')
| -rw-r--r-- | drivers/acpi/sleep.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index ea9cc373ffd8..cb889c715e14 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; |