From: Eric W. Biederman Date: Tue, 26 Jul 2005 18:17:52 +0000 (-0600) Subject: [PATCH] acpi: Don't call acpi_sleep_prepare from acpi_power_off X-Git-Tag: v2.6.13-rc4~41 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b35c67a46b025e8dc320b59fbe5c283094e1d7f5;p=pandora-kernel.git [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 Signed-off-by: Linus Torvalds --- Reading git-diff-tree failed