diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2010-07-01 10:11:45 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-07-06 22:34:26 -0400 |
| commit | a44061aa8b5d58b2729faca4c155a94a5bea2a09 (patch) | |
| tree | 3f4e72439ad65c443c0151961883ea0a6e14d20d /include/acpi | |
| parent | e8b6f970107cfc9c00cdcdb12ec6c7e135cf379f (diff) | |
| download | linux-3.10-a44061aa8b5d58b2729faca4c155a94a5bea2a09.tar.gz linux-3.10-a44061aa8b5d58b2729faca4c155a94a5bea2a09.tar.bz2 linux-3.10-a44061aa8b5d58b2729faca4c155a94a5bea2a09.zip | |
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 'include/acpi')
| -rw-r--r-- | include/acpi/acpixf.h | 6 | ||||
| -rw-r--r-- | include/acpi/actypes.h | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 17396e83e1a..354d785e80c 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@ -284,11 +284,9 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status); */ acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action); -acpi_status -acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type); +acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); -acpi_status -acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number, u8 gpe_type); +acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number); acpi_status acpi_clear_gpe(acpi_handle gpe_device, u32 gpe_number); diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 6a65a94897b..a42513ded3a 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -669,12 +669,6 @@ typedef u32 acpi_event_status; #define ACPI_GPE_DISABLE 1 #define ACPI_GPE_COND_ENABLE 2 -/* gpe_types for acpi_enable_gpe and acpi_disable_gpe */ - -#define ACPI_GPE_TYPE_WAKE (u8) 0x01 -#define ACPI_GPE_TYPE_RUNTIME (u8) 0x02 -#define ACPI_GPE_TYPE_WAKE_RUN (u8) 0x03 - /* * GPE info flags - Per GPE * +-------+---+-+-+ |