From: Rafael J. Wysocki <rjw@sisk.pl>
Date: Thu, 19 Jul 2007 08:47:39 +0000 (-0700)
Subject: ACPI: Do not prepare for hibernation in acpi_shutdown
X-Git-Tag: v2.6.23-rc1~451
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d7372cdf6938ccea23ec9fc68970702fed9ec3c8;p=linux-2.6-omap-h63xx.git

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 d9801eff648..240dde9cf13 100644
--- 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;
 	}