From patchwork Thu Jul 1 22:14:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 109736 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o61MH8rC028887 for ; Thu, 1 Jul 2010 22:17:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932577Ab0GAWRA (ORCPT ); Thu, 1 Jul 2010 18:17:00 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:42774 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932556Ab0GAWQ6 (ORCPT ); Thu, 1 Jul 2010 18:16:58 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id A9BDD18A91C; Fri, 2 Jul 2010 00:03:22 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 07141-04; Fri, 2 Jul 2010 00:03:11 +0200 (CEST) Received: from ferrari.localnet (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 2EA1718AA87; Fri, 2 Jul 2010 00:02:55 +0200 (CEST) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 5/5] ACPI / Sleep: Drop acpi_suspend_finish() Date: Fri, 2 Jul 2010 00:14:57 +0200 User-Agent: KMail/1.13.3 (Linux/2.6.35-rc3-rjw+; KDE/4.4.3; x86_64; ; ) Cc: ACPI Devel Maling List , Matthew Garrett , linux-pm@lists.linux-foundation.org References: <201007020010.13755.rjw@sisk.pl> In-Reply-To: <201007020010.13755.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007020014.57877.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 01 Jul 2010 22:17:09 +0000 (UTC) Index: linux-2.6/drivers/acpi/sleep.c =================================================================== --- linux-2.6.orig/drivers/acpi/sleep.c +++ linux-2.6/drivers/acpi/sleep.c @@ -285,11 +285,6 @@ static int acpi_suspend_enter(suspend_st return ACPI_SUCCESS(status) ? 0 : -EFAULT; } -static void acpi_suspend_finish(void) -{ - acpi_pm_finish(); -} - static int acpi_suspend_state_valid(suspend_state_t pm_state) { u32 acpi_state; @@ -311,7 +306,7 @@ static struct platform_suspend_ops acpi_ .begin = acpi_suspend_begin, .prepare_late = acpi_pm_prepare, .enter = acpi_suspend_enter, - .wake = acpi_suspend_finish, + .wake = acpi_pm_finish, .end = acpi_pm_end, }; @@ -339,7 +334,7 @@ static struct platform_suspend_ops acpi_ .begin = acpi_suspend_begin_old, .prepare_late = acpi_pm_pre_suspend, .enter = acpi_suspend_enter, - .wake = acpi_suspend_finish, + .wake = acpi_pm_finish, .end = acpi_pm_end, .recover = acpi_pm_finish, };