From: Rafael J. Wysocki <rjw@xxxxxxx> Remove some redundant code from acpi_enter_sleep_state_prep() and clean up a comment in there. Signed-off-by: Rafael J. Wysocki <rjw@xxxxxxx> --- 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) - To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html