[PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off
commitb35c67a46b025e8dc320b59fbe5c283094e1d7f5
authorEric W. Biederman <ebiederm@xmission.com>
Tue, 26 Jul 2005 18:17:52 +0000 (26 12:17 -0600)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Jul 2005 21:35:45 +0000 (26 14:35 -0700)
treedd22c5d664496ce9caab45825bb7f7ab1fe60545
parent6660316cb7a1a2c59a73a52870490c0f782f45c1
[PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off

Now that all of the code paths that call acpi_power_off
have been modified to call either call kernel_power_off
(which calls apci_sleep_prepare by way of acpi_shutdown)
or to call acpi_sleep_prepare directly it is redundant to call
acpi_sleep_prepare from acpi_power_off.

So simplify the code and simply don't call acpi_sleep_prepare.

In addition there is a little error handling done so if we
can't register the acpi class we don't hook pm_power_off.

I think I have done the right thing with the CONFIG_PM define
but I'm not certain.  Can this code even be compiled if
CONFIG_PM is false?

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/acpi/sleep/poweroff.c