diff options
Diffstat (limited to 'drivers/acpi/acpica/evgpe.c')
-rw-r--r-- | drivers/acpi/acpica/evgpe.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index 005c170d2448..3fb621eec2fa 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c | |||
@@ -409,7 +409,9 @@ u32 acpi_ev_gpe_detect(struct acpi_gpe_xrupt_info * gpe_xrupt_list) | |||
409 | * or method. | 409 | * or method. |
410 | */ | 410 | */ |
411 | int_status |= | 411 | int_status |= |
412 | acpi_ev_gpe_dispatch(&gpe_block-> | 412 | acpi_ev_gpe_dispatch(gpe_block-> |
413 | node, | ||
414 | &gpe_block-> | ||
413 | event_info[((acpi_size) i * ACPI_GPE_REGISTER_WIDTH) + j], j + gpe_register_info->base_gpe_number); | 415 | event_info[((acpi_size) i * ACPI_GPE_REGISTER_WIDTH) + j], j + gpe_register_info->base_gpe_number); |
414 | } | 416 | } |
415 | } | 417 | } |
@@ -542,7 +544,8 @@ static void acpi_ev_asynch_enable_gpe(void *context) | |||
542 | * | 544 | * |
543 | * FUNCTION: acpi_ev_gpe_dispatch | 545 | * FUNCTION: acpi_ev_gpe_dispatch |
544 | * | 546 | * |
545 | * PARAMETERS: gpe_event_info - Info for this GPE | 547 | * PARAMETERS: gpe_device - Device node. NULL for GPE0/GPE1 |
548 | * gpe_event_info - Info for this GPE | ||
546 | * gpe_number - Number relative to the parent GPE block | 549 | * gpe_number - Number relative to the parent GPE block |
547 | * | 550 | * |
548 | * RETURN: INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED | 551 | * RETURN: INTERRUPT_HANDLED or INTERRUPT_NOT_HANDLED |
@@ -555,7 +558,8 @@ static void acpi_ev_asynch_enable_gpe(void *context) | |||
555 | ******************************************************************************/ | 558 | ******************************************************************************/ |
556 | 559 | ||
557 | u32 | 560 | u32 |
558 | acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number) | 561 | acpi_ev_gpe_dispatch(struct acpi_namespace_node *gpe_device, |
562 | struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number) | ||
559 | { | 563 | { |
560 | acpi_status status; | 564 | acpi_status status; |
561 | 565 | ||
@@ -593,7 +597,9 @@ acpi_ev_gpe_dispatch(struct acpi_gpe_event_info *gpe_event_info, u32 gpe_number) | |||
593 | * Ignore return status for now. | 597 | * Ignore return status for now. |
594 | * TBD: leave GPE disabled on error? | 598 | * TBD: leave GPE disabled on error? |
595 | */ | 599 | */ |
596 | (void)gpe_event_info->dispatch.handler->address(gpe_event_info-> | 600 | (void)gpe_event_info->dispatch.handler->address(gpe_device, |
601 | gpe_number, | ||
602 | gpe_event_info-> | ||
597 | dispatch. | 603 | dispatch. |
598 | handler-> | 604 | handler-> |
599 | context); | 605 | context); |