From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761396AbXHVJqo (ORCPT ); Wed, 22 Aug 2007 05:46:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752898AbXHVJqf (ORCPT ); Wed, 22 Aug 2007 05:46:35 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:48870 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752728AbXHVJqe (ORCPT ); Wed, 22 Aug 2007 05:46:34 -0400 From: "Rafael J. Wysocki" To: Andrew Morton Subject: [PATCH] ACPI: Clean up acpi_enter_sleep_state_prep Date: Wed, 22 Aug 2007 11:56:35 +0200 User-Agent: KMail/1.9.5 Cc: ACPI Devel Maling List , Len Brown , LKML , Pavel Machek , pm list MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200708221156.36235.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki Remove some redundant code from acpi_enter_sleep_state_prep() and clean up a comment in there. Signed-off-by: Rafael J. Wysocki --- drivers/acpi/hardware/hwsleep.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) Index: linux-2.6.23-rc3/drivers/acpi/hardware/hwsleep.c =================================================================== --- linux-2.6.23-rc3.orig/drivers/acpi/hardware/hwsleep.c 2007-08-22 11:40:30.000000000 +0200 +++ linux-2.6.23-rc3/drivers/acpi/hardware/hwsleep.c 2007-08-22 11:40:53.000000000 +0200 @@ -234,15 +234,11 @@ acpi_status acpi_enter_sleep_state_prep( "While executing method _SST")); } - /* - * 1) Disable/Clear all GPEs - */ + /* Disable/Clear all GPEs */ + status = acpi_hw_disable_all_gpes(); - if (ACPI_FAILURE(status)) { - return_ACPI_STATUS(status); - } - return_ACPI_STATUS(AE_OK); + return_ACPI_STATUS(status); } ACPI_EXPORT_SYMBOL(acpi_enter_sleep_state_prep)