From patchwork Sun Jul 4 23:00:49 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 110159 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 o64N3pQn029021 for ; Sun, 4 Jul 2010 23:03:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755973Ab0GDXDx (ORCPT ); Sun, 4 Jul 2010 19:03:53 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:50851 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750733Ab0GDXDu (ORCPT ); Sun, 4 Jul 2010 19:03:50 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 342EE187BD9; Mon, 5 Jul 2010 00:49:00 +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 04980-05; Mon, 5 Jul 2010 00:48:46 +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 46BDC18A7B1; Mon, 5 Jul 2010 00:48:46 +0200 (CEST) From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 2/3] ACPI / ACPICA: Simplify acpi_ev_initialize_gpe_block() Date: Mon, 5 Jul 2010 01:00:49 +0200 User-Agent: KMail/1.13.5 (Linux/2.6.35-rc3-rjw+; KDE/4.4.4; x86_64; ; ) Cc: ACPI Devel Maling List , Lin Ming , Matthew Garrett , "Moore, Robert" , Linux PM References: <201007050056.22705.rjw@sisk.pl> In-Reply-To: <201007050056.22705.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007050100.49823.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]); Sun, 04 Jul 2010 23:03:54 +0000 (UTC) Index: linux-2.6/drivers/acpi/acpica/evgpeblk.c =================================================================== --- linux-2.6.orig/drivers/acpi/acpica/evgpeblk.c +++ linux-2.6/drivers/acpi/acpica/evgpeblk.c @@ -472,26 +472,21 @@ acpi_ev_initialize_gpe_block(struct acpi gpe_event_info = &gpe_block->event_info[gpe_index]; gpe_number = gpe_index + gpe_block->block_base_number; - /* - * If the GPE has already been enabled for runtime - * signaling, make sure it remains enabled, but do not - * increment its reference counter. - */ - if (gpe_event_info->runtime_count) { - status = acpi_ev_enable_gpe(gpe_event_info); - goto enabled; - } - /* Ignore GPEs that have no corresponding _Lxx/_Exx method */ if (!(gpe_event_info->flags & ACPI_GPE_DISPATCH_METHOD)) { continue; } - /* Enable this GPE */ + /* + * If the GPE has already been enabled for runtime + * signaling, make sure it remains enabled, but do not + * increment its reference counter. + */ + status = gpe_event_info->runtime_count ? + acpi_ev_enable_gpe(gpe_event_info) : + acpi_enable_gpe(gpe_device, gpe_number); - status = acpi_enable_gpe(gpe_device, gpe_number); - enabled: if (ACPI_FAILURE(status)) { ACPI_EXCEPTION((AE_INFO, status, "Could not enable GPE 0x%02X",