aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorAlexey Starikovskiy <astarikovskiy@suse.de>2008-03-24 16:22:29 -0400
committerLen Brown <len.brown@intel.com>2008-03-24 20:51:29 -0400
commit6d9e11206371be370b153264934378a29b6afe9b (patch)
tree176c80e236609b9919bb86c5f7a9a6a916e1c2ae /drivers/acpi
parentfa95ba04e6ba11d71e1b87becd054b38faf546c8 (diff)
ACPI: EC: Use default setup handler
Signed-off-by: Alexey Starikovskiy <astarikovskiy@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
-rw-r--r--drivers/acpi/ec.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index f0e82166bb5c..167af373bab3 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -533,20 +533,6 @@ static void do_ec_poll(struct work_struct *work)
533 -------------------------------------------------------------------------- */ 533 -------------------------------------------------------------------------- */
534 534
535static acpi_status 535static acpi_status
536acpi_ec_space_setup(acpi_handle region_handle,
537 u32 function, void *handler_context, void **return_context)
538{
539 /*
540 * The EC object is in the handler context and is needed
541 * when calling the acpi_ec_space_handler.
542 */
543 *return_context = (function != ACPI_REGION_DEACTIVATE) ?
544 handler_context : NULL;
545
546 return AE_OK;
547}
548
549static acpi_status
550acpi_ec_space_handler(u32 function, acpi_physical_address address, 536acpi_ec_space_handler(u32 function, acpi_physical_address address,
551 u32 bits, acpi_integer *value, 537 u32 bits, acpi_integer *value,
552 void *handler_context, void *region_context) 538 void *handler_context, void *region_context)
@@ -858,7 +844,7 @@ static int ec_install_handlers(struct acpi_ec *ec)
858 status = acpi_install_address_space_handler(ec->handle, 844 status = acpi_install_address_space_handler(ec->handle,
859 ACPI_ADR_SPACE_EC, 845 ACPI_ADR_SPACE_EC,
860 &acpi_ec_space_handler, 846 &acpi_ec_space_handler,
861 &acpi_ec_space_setup, ec); 847 NULL, ec);
862 if (ACPI_FAILURE(status)) { 848 if (ACPI_FAILURE(status)) {
863 acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler); 849 acpi_remove_gpe_handler(NULL, ec->gpe, &acpi_ec_gpe_handler);
864 return -ENODEV; 850 return -ENODEV;