ACPI: Do not prepare for hibernation in acpi_shutdown

Since we are now explicitly calling hibernation_ops->prepare() before
hibernation_ops->enter() in hibernation_platform_enter() (defined in
kernel/power/disk.c), ACPI should not call acpi_sleep_prepare(ACPI_STATE_S4)
from acpi_shutdown().

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Pavel Machek <pavel@ucw.cz>
Cc: Len Brown <lenb@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index d9801eff6489c1448e2e33c20650c21f0e399469..240dde9cf13ac21f5ea3aeee4197ee02721f82ba 100644 (file)
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -54,9 +54,6 @@ static int acpi_shutdown(struct sys_device *x)
        case SYSTEM_POWER_OFF:
                /* Prepare to power off the system */
                return acpi_sleep_prepare(ACPI_STATE_S5);
-       case SYSTEM_SUSPEND_DISK:
-               /* Prepare to suspend the system to disk */
-               return acpi_sleep_prepare(ACPI_STATE_S4);
        default:
                return 0;
        }