diff options
| -rw-r--r-- | drivers/acpi/acpica/evxfevnt.c | 60 | ||||
| -rw-r--r-- | include/acpi/acpixf.h | 2 | ||||
| -rw-r--r-- | include/acpi/actypes.h | 2 |
3 files changed, 1 insertions, 63 deletions
diff --git a/drivers/acpi/acpica/evxfevnt.c b/drivers/acpi/acpica/evxfevnt.c index b094cc0183d7..fda5b44a5567 100644 --- a/drivers/acpi/acpica/evxfevnt.c +++ b/drivers/acpi/acpica/evxfevnt.c | |||
| @@ -210,66 +210,6 @@ ACPI_EXPORT_SYMBOL(acpi_enable_event) | |||
| 210 | 210 | ||
| 211 | /******************************************************************************* | 211 | /******************************************************************************* |
| 212 | * | 212 | * |
| 213 | * FUNCTION: acpi_set_gpe | ||
| 214 | * | ||
| 215 | * PARAMETERS: gpe_device - Parent GPE Device. NULL for GPE0/GPE1 | ||
| 216 | * gpe_number - GPE level within the GPE block | ||
| 217 | * action - ACPI_GPE_ENABLE or ACPI_GPE_DISABLE | ||
| 218 | * | ||
| 219 | * RETURN: Status | ||
| 220 | * | ||
| 221 | * DESCRIPTION: Enable or disable an individual GPE. This function bypasses | ||
| 222 | * the reference count mechanism used in the acpi_enable_gpe and | ||
| 223 | * acpi_disable_gpe interfaces -- and should be used with care. | ||
| 224 | * | ||
| 225 | * Note: Typically used to disable a runtime GPE for short period of time, | ||
| 226 | * then re-enable it, without disturbing the existing reference counts. This | ||
| 227 | * is useful, for example, in the Embedded Controller (EC) driver. | ||
| 228 | * | ||
| 229 | ******************************************************************************/ | ||
| 230 | acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action) | ||
| 231 | { | ||
| 232 | struct acpi_gpe_event_info *gpe_event_info; | ||
| 233 | acpi_status status; | ||
| 234 | acpi_cpu_flags flags; | ||
| 235 | |||
| 236 | ACPI_FUNCTION_TRACE(acpi_set_gpe); | ||
| 237 | |||
| 238 | flags = acpi_os_acquire_lock(acpi_gbl_gpe_lock); | ||
| 239 | |||
| 240 | /* Ensure that we have a valid GPE number */ | ||
| 241 | |||
| 242 | gpe_event_info = acpi_ev_get_gpe_event_info(gpe_device, gpe_number); | ||
| 243 | if (!gpe_event_info) { | ||
| 244 | status = AE_BAD_PARAMETER; | ||
| 245 | goto unlock_and_exit; | ||
| 246 | } | ||
| 247 | |||
| 248 | /* Perform the action */ | ||
| 249 | |||
| 250 | switch (action) { | ||
| 251 | case ACPI_GPE_ENABLE: | ||
| 252 | status = acpi_ev_enable_gpe(gpe_event_info); | ||
| 253 | break; | ||
| 254 | |||
| 255 | case ACPI_GPE_DISABLE: | ||
| 256 | status = acpi_hw_low_set_gpe(gpe_event_info, ACPI_GPE_DISABLE); | ||
| 257 | break; | ||
| 258 | |||
| 259 | default: | ||
| 260 | status = AE_BAD_PARAMETER; | ||
| 261 | break; | ||
| 262 | } | ||
| 263 | |||
| 264 | unlock_and_exit: | ||
| 265 | acpi_os_release_lock(acpi_gbl_gpe_lock, flags); | ||
| 266 | return_ACPI_STATUS(status); | ||
| 267 | } | ||
| 268 | |||
| 269 | ACPI_EXPORT_SYMBOL(acpi_set_gpe) | ||
| 270 | |||
| 271 | /******************************************************************************* | ||
| 272 | * | ||
| 273 | * FUNCTION: acpi_gpe_wakeup | 213 | * FUNCTION: acpi_gpe_wakeup |
| 274 | * | 214 | * |
| 275 | * PARAMETERS: gpe_device - Parent GPE Device. NULL for GPE0/GPE1 | 215 | * PARAMETERS: gpe_device - Parent GPE Device. NULL for GPE0/GPE1 |
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 354d785e80cb..e0a53e4616df 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
| @@ -282,8 +282,6 @@ acpi_status acpi_get_event_status(u32 event, acpi_event_status * event_status); | |||
| 282 | /* | 282 | /* |
| 283 | * GPE Interfaces | 283 | * GPE Interfaces |
| 284 | */ | 284 | */ |
| 285 | acpi_status acpi_set_gpe(acpi_handle gpe_device, u32 gpe_number, u8 action); | ||
| 286 | |||
| 287 | acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); | 285 | acpi_status acpi_enable_gpe(acpi_handle gpe_device, u32 gpe_number); |
| 288 | 286 | ||
| 289 | acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number); | 287 | acpi_status acpi_disable_gpe(acpi_handle gpe_device, u32 gpe_number); |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index a42513ded3a4..5db8f472fec9 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
| @@ -663,7 +663,7 @@ typedef u32 acpi_event_status; | |||
| 663 | #define ACPI_GPE_MAX 0xFF | 663 | #define ACPI_GPE_MAX 0xFF |
| 664 | #define ACPI_NUM_GPE 256 | 664 | #define ACPI_NUM_GPE 256 |
| 665 | 665 | ||
| 666 | /* Actions for acpi_set_gpe, acpi_gpe_wakeup, acpi_hw_low_set_gpe */ | 666 | /* Actions for acpi_gpe_wakeup, acpi_hw_low_set_gpe */ |
| 667 | 667 | ||
| 668 | #define ACPI_GPE_ENABLE 0 | 668 | #define ACPI_GPE_ENABLE 0 |
| 669 | #define ACPI_GPE_DISABLE 1 | 669 | #define ACPI_GPE_DISABLE 1 |
