diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/acpixf.h | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h index 01ba80b1f91f..cfe929b23d8a 100644 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h | |||
| @@ -131,10 +131,9 @@ acpi_status __init acpi_terminate(void); | |||
| 131 | * Miscellaneous global interfaces | 131 | * Miscellaneous global interfaces |
| 132 | */ | 132 | */ |
| 133 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable(void)) | 133 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable(void)) |
| 134 | |||
| 135 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable(void)) | 134 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable(void)) |
| 136 | #ifdef ACPI_FUTURE_USAGE | 135 | #ifdef ACPI_FUTURE_USAGE |
| 137 | acpi_status acpi_subsystem_status(void); | 136 | acpi_status acpi_subsystem_status(void); |
| 138 | #endif | 137 | #endif |
| 139 | 138 | ||
| 140 | #ifdef ACPI_FUTURE_USAGE | 139 | #ifdef ACPI_FUTURE_USAGE |
| @@ -279,16 +278,13 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 279 | acpi_install_sci_handler(acpi_sci_handler | 278 | acpi_install_sci_handler(acpi_sci_handler |
| 280 | address, | 279 | address, |
| 281 | void *context)) | 280 | void *context)) |
| 282 | |||
| 283 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 281 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 284 | acpi_remove_sci_handler(acpi_sci_handler | 282 | acpi_remove_sci_handler(acpi_sci_handler |
| 285 | address)) | 283 | address)) |
| 286 | |||
| 287 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 284 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 288 | acpi_install_global_event_handler | 285 | acpi_install_global_event_handler |
| 289 | (acpi_gbl_event_handler handler, | 286 | (acpi_gbl_event_handler handler, |
| 290 | void *context)) | 287 | void *context)) |
| 291 | |||
| 292 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 288 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 293 | acpi_install_fixed_event_handler(u32 | 289 | acpi_install_fixed_event_handler(u32 |
| 294 | acpi_event, | 290 | acpi_event, |
| @@ -296,12 +292,10 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 296 | handler, | 292 | handler, |
| 297 | void | 293 | void |
| 298 | *context)) | 294 | *context)) |
| 299 | |||
| 300 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 295 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 301 | acpi_remove_fixed_event_handler(u32 acpi_event, | 296 | acpi_remove_fixed_event_handler(u32 acpi_event, |
| 302 | acpi_event_handler | 297 | acpi_event_handler |
| 303 | handler)) | 298 | handler)) |
| 304 | |||
| 305 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 299 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 306 | acpi_install_gpe_handler(acpi_handle | 300 | acpi_install_gpe_handler(acpi_handle |
| 307 | gpe_device, | 301 | gpe_device, |
| @@ -310,15 +304,14 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 310 | acpi_gpe_handler | 304 | acpi_gpe_handler |
| 311 | address, | 305 | address, |
| 312 | void *context)) | 306 | void *context)) |
| 313 | |||
| 314 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 307 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 315 | acpi_remove_gpe_handler(acpi_handle gpe_device, | 308 | acpi_remove_gpe_handler(acpi_handle gpe_device, |
| 316 | u32 gpe_number, | 309 | u32 gpe_number, |
| 317 | acpi_gpe_handler | 310 | acpi_gpe_handler |
| 318 | address)) | 311 | address)) |
| 319 | acpi_status acpi_install_notify_handler(acpi_handle device, u32 handler_type, | 312 | acpi_status acpi_install_notify_handler(acpi_handle device, u32 handler_type, |
| 320 | acpi_notify_handler handler, | 313 | acpi_notify_handler handler, |
| 321 | void *context); | 314 | void *context); |
| 322 | 315 | ||
| 323 | acpi_status | 316 | acpi_status |
| 324 | acpi_remove_notify_handler(acpi_handle device, | 317 | acpi_remove_notify_handler(acpi_handle device, |
| @@ -367,7 +360,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 367 | 360 | ||
| 368 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 361 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 369 | acpi_disable_event(u32 event, u32 flags)) | 362 | acpi_disable_event(u32 event, u32 flags)) |
| 370 | |||
| 371 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_clear_event(u32 event)) | 363 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_clear_event(u32 event)) |
| 372 | 364 | ||
| 373 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 365 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| @@ -405,20 +397,16 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 405 | parent_device, | 397 | parent_device, |
| 406 | acpi_handle gpe_device, | 398 | acpi_handle gpe_device, |
| 407 | u32 gpe_number)) | 399 | u32 gpe_number)) |
| 408 | |||
| 409 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 400 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 410 | acpi_set_gpe_wake_mask(acpi_handle gpe_device, | 401 | acpi_set_gpe_wake_mask(acpi_handle gpe_device, |
| 411 | u32 gpe_number, | 402 | u32 gpe_number, |
| 412 | u8 action)) | 403 | u8 action)) |
| 413 | |||
| 414 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 404 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 415 | acpi_get_gpe_status(acpi_handle gpe_device, | 405 | acpi_get_gpe_status(acpi_handle gpe_device, |
| 416 | u32 gpe_number, | 406 | u32 gpe_number, |
| 417 | acpi_event_status | 407 | acpi_event_status |
| 418 | *event_status)) | 408 | *event_status)) |
| 419 | |||
| 420 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void)) | 409 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_disable_all_gpes(void)) |
| 421 | |||
| 422 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void)) | 410 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_enable_all_runtime_gpes(void)) |
| 423 | 411 | ||
| 424 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 412 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| @@ -432,7 +420,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 432 | *gpe_block_address, | 420 | *gpe_block_address, |
| 433 | u32 register_count, | 421 | u32 register_count, |
| 434 | u32 interrupt_number)) | 422 | u32 interrupt_number)) |
| 435 | |||
| 436 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 423 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 437 | acpi_remove_gpe_block(acpi_handle gpe_device)) | 424 | acpi_remove_gpe_block(acpi_handle gpe_device)) |
| 438 | 425 | ||
| @@ -533,7 +520,6 @@ ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | |||
| 533 | #ifdef ACPI_FUTURE_USAGE | 520 | #ifdef ACPI_FUTURE_USAGE |
| 534 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 521 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
| 535 | acpi_get_timer_resolution(u32 *resolution)) | 522 | acpi_get_timer_resolution(u32 *resolution)) |
| 536 | |||
| 537 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_get_timer(u32 *ticks)) | 523 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status acpi_get_timer(u32 *ticks)) |
| 538 | 524 | ||
| 539 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status | 525 | ACPI_HW_DEPENDENT_RETURN_STATUS(acpi_status |
