diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-06-30 22:11:45 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2010-07-06 22:34:26 -0400 |
commit | a44061aa8b5d58b2729faca4c155a94a5bea2a09 (patch) | |
tree | 3f4e72439ad65c443c0151961883ea0a6e14d20d /drivers/acpi/ec.c | |
parent | e8b6f970107cfc9c00cdcdb12ec6c7e135cf379f (diff) |
ACPICA: Remove wakeup GPE reference counting which is not used
After the previous patch that introduced acpi_gpe_wakeup() and
modified the ACPI suspend and wakeup code to use it, the third
argument of acpi_{enable|disable}_gpe() and the GPE wakeup
reference counter are not necessary any more. Remove them and
modify all of the users of acpi_{enable|disable}_gpe()
accordingly. Also drop GPE type constants that aren't used
any more.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 5f2027d782e8..bf5045416575 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -822,7 +822,7 @@ static int ec_install_handlers(struct acpi_ec *ec) | |||
822 | if (ACPI_FAILURE(status)) | 822 | if (ACPI_FAILURE(status)) |
823 | return -ENODEV; | 823 | return -ENODEV; |
824 | 824 | ||
825 | acpi_enable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME); | 825 | acpi_enable_gpe(NULL, ec->gpe); |
826 | status = acpi_install_address_space_handler(ec->handle, | 826 | status = acpi_install_address_space_handler(ec->handle, |
827 | ACPI_ADR_SPACE_EC, | 827 | ACPI_ADR_SPACE_EC, |
828 | &acpi_ec_space_handler, | 828 | &acpi_ec_space_handler, |
@@ -839,7 +839,7 @@ static int ec_install_handlers(struct acpi_ec *ec) | |||
839 | } else { | 839 | } else { |
840 | acpi_remove_gpe_handler(NULL, ec->gpe, | 840 | acpi_remove_gpe_handler(NULL, ec->gpe, |
841 | &acpi_ec_gpe_handler); | 841 | &acpi_ec_gpe_handler); |
842 | acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME); | 842 | acpi_disable_gpe(NULL, ec->gpe); |
843 | return -ENODEV; | 843 | return -ENODEV; |
844 | } | 844 | } |
845 | } | 845 | } |
@@ -850,7 +850,7 @@ static int ec_install_handlers(struct acpi_ec *ec) | |||
850 | 850 | ||
851 | static void ec_remove_handlers(struct acpi_ec *ec) | 851 | static void ec_remove_handlers(struct acpi_ec *ec) |
852 | { | 852 | { |
853 | acpi_disable_gpe(NULL, ec->gpe, ACPI_GPE_TYPE_RUNTIME); | 853 | acpi_disable_gpe(NULL, ec->gpe); |
854 | if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle, | 854 | if (ACPI_FAILURE(acpi_remove_address_space_handler(ec->handle, |
855 | ACPI_ADR_SPACE_EC, &acpi_ec_space_handler))) | 855 | ACPI_ADR_SPACE_EC, &acpi_ec_space_handler))) |
856 | pr_err(PREFIX "failed to remove space handler\n"); | 856 | pr_err(PREFIX "failed to remove space handler\n"); |