From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261991AbVGZSEE (ORCPT ); Tue, 26 Jul 2005 14:04:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261988AbVGZSCV (ORCPT ); Tue, 26 Jul 2005 14:02:21 -0400 Received: from ebiederm.dsl.xmission.com ([166.70.28.69]:47751 "EHLO ebiederm.dsl.xmission.com") by vger.kernel.org with ESMTP id S261991AbVGZSB5 (ORCPT ); Tue, 26 Jul 2005 14:01:57 -0400 To: Andrew Morton Cc: Linus Torvalds , Subject: [PATCH 16/23] swpsuspend: Have suspend to disk use factors of sys_reboot References: From: ebiederm@xmission.com (Eric W. Biederman) Date: Tue, 26 Jul 2005 12:01:17 -0600 In-Reply-To: (Eric W. Biederman's message of "Tue, 26 Jul 2005 11:59:54 -0600") Message-ID: User-Agent: Gnus/5.1007 (Gnus v5.10.7) Emacs/21.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org The suspend to disk code was a poor copy of the code in sys_reboot now that we have kernel_power_off, kernel_restart and kernel_halt use them instead of poorly duplicating them inline. Signed-off-by: Eric W. Biederman --- kernel/power/disk.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) 78a2f83d732e327874fe73728d5667875dfeea46 diff --git a/kernel/power/disk.c b/kernel/power/disk.c --- a/kernel/power/disk.c +++ b/kernel/power/disk.c @@ -59,16 +59,13 @@ static void power_down(suspend_disk_meth error = pm_ops->enter(PM_SUSPEND_DISK); break; case PM_DISK_SHUTDOWN: - printk("Powering off system\n"); - device_shutdown(); - machine_power_off(); + kernel_power_off(); break; case PM_DISK_REBOOT: - device_shutdown(); - machine_restart(NULL); + kernel_restart(NULL); break; } - machine_halt(); + kernel_halt(); /* Valid image is on the disk, if we continue we risk serious data corruption after resume. */ printk(KERN_CRIT "Please power me down manually\n");