Skip to content

Commit

Permalink
ACPI: ec: Remove calls to clear_gpe() and enable_gpe(), as these are …
Browse files Browse the repository at this point in the history
…handled at

dispatch_gpe() level.

Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Alexey Starikovskiy authored and Len Brown committed Dec 8, 2006
1 parent af3fd14 commit e41334c
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions drivers/acpi/ec.c
Original file line number Diff line number Diff line change
Expand Up @@ -428,24 +428,21 @@ static void acpi_ec_gpe_query(void *ec_cxt)
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)
Expand All @@ -454,7 +451,6 @@ static u32 acpi_ec_gpe_handler(void *data)
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);
Expand All @@ -464,7 +460,7 @@ static u32 acpi_ec_gpe_handler(void *data)
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;
}
Expand Down

0 comments on commit e41334c

Please sign in to comment.