commit e41334c0a6ef71458f255db25f011d15099e7cca
author Alexey Starikovskiy <alexey.y.starikovskiy@intel.com> Thu Dec 07 18:42:16 2006 +0300
committer Len Brown <len.brown@intel.com> Fri Dec 08 02:56:06 2006 -0500
tree 6b66194660fd2e34dc668187e4745beb7382e924
parent af3fd1404fd4f0f58ebbb52b22be4f1ca0794cda

ACPI: ec: Remove calls to clear_gpe() and enable_gpe(), as these are handled at

dispatch_gpe() level.

Signed-off-by: Len Brown <len.brown@intel.com>

drivers/acpi/ec.c

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1514e71..acfe883 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -428,24 +428,21 @@
 	static char object_name[8];
 
 	if (!ec)
-		goto end;
+		return;
 
 	value = acpi_ec_read_status(ec);
 
 	if (!(value & ACPI_EC_FLAG_SCI))
-		goto end;
+		return;
 
 	if (acpi_ec_query(ec, &value))
-		goto end;
+		return;
 
 	snprintf(object_name, 8, "_Q%2.2X", value);
 
 	printk(KERN_INFO PREFIX "evaluating %s\n", object_name);
 
 	acpi_evaluate_object(ec->handle, object_name, NULL, NULL);
-
-      end:
-	acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_NOT_ISR);
 }
 
 static u32 acpi_ec_gpe_handler(void *data)
@@ -454,7 +451,6 @@
 	u8 value;
 	struct acpi_ec *ec = (struct acpi_ec *)data;
 
-	acpi_clear_gpe(NULL, ec->gpe_bit, ACPI_ISR);
 
 	if (acpi_ec_mode == EC_INTR) {
 		wake_up(&ec->wait);
@@ -464,7 +460,7 @@
 	if (value & ACPI_EC_FLAG_SCI) {
 		status = acpi_os_execute(OSL_EC_BURST_HANDLER, acpi_ec_gpe_query, ec);
 	}
-	acpi_enable_gpe(NULL, ec->gpe_bit, ACPI_ISR);
+
 	return status == AE_OK ?
 	    ACPI_INTERRUPT_HANDLED : ACPI_INTERRUPT_NOT_HANDLED;
 }