From patchwork Fri Jun 19 20:58:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 31455 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n5JKvp8a032148 for ; Fri, 19 Jun 2009 20:58:05 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752485AbZFSU6B (ORCPT ); Fri, 19 Jun 2009 16:58:01 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752698AbZFSU6B (ORCPT ); Fri, 19 Jun 2009 16:58:01 -0400 Received: from g5t0008.atlanta.hp.com ([15.192.0.45]:17903 "EHLO g5t0008.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752485AbZFSU6A (ORCPT ); Fri, 19 Jun 2009 16:58:00 -0400 Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127]) by g5t0008.atlanta.hp.com (Postfix) with ESMTP id 6947824026; Fri, 19 Jun 2009 20:58:03 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp1.fc.hp.com (Postfix) with ESMTP id 90667255846; Fri, 19 Jun 2009 20:22:19 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id E89C62616C; Fri, 19 Jun 2009 14:58:02 -0600 (MDT) Subject: [PATCH 3/3] ACPI: remove clearing of events on resume, now that ACPI CA does it To: Bob Moore , Len Brown From: Bjorn Helgaas Cc: Zhao Yakui , linux-acpi@vger.kernel.org Date: Fri, 19 Jun 2009 14:58:02 -0600 Message-ID: <20090619205802.30130.60093.stgit@bob.kio> In-Reply-To: <20090619205713.30130.79530.stgit@bob.kio> References: <20090619205713.30130.79530.stgit@bob.kio> User-Agent: StGit/0.14.3.385.gd87a.dirty MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org The ACPI CA now clears GPEs and power button events in acpi_leave_sleep_state_prep(), so there's no need for us to do it again. Signed-off-by: Bjorn Helgaas CC: Zhao Yakui --- drivers/acpi/sleep.c | 14 -------------- 1 files changed, 0 insertions(+), 14 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 01574a0..bf2e2e1 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -257,20 +257,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state) /* Reprogram control registers and execute _BFS */ acpi_leave_sleep_state_prep(acpi_state); - /* ACPI 3.0 specs (P62) says that it's the responsibility - * of the OSPM to clear the status bit [ implying that the - * POWER_BUTTON event should not reach userspace ] - */ - if (ACPI_SUCCESS(status) && (acpi_state == ACPI_STATE_S3)) - acpi_clear_event(ACPI_EVENT_POWER_BUTTON); - - /* - * Disable and clear GPE status before interrupt is enabled. Some GPEs - * (like wakeup GPE) haven't handler, this can avoid such GPE misfire. - * acpi_leave_sleep_state will reenable specific GPEs later - */ - acpi_disable_all_gpes(); - local_irq_restore(flags); printk(KERN_DEBUG "Back to C!\n");