diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:31:15 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-11-07 13:31:15 -0500 |
commit | 63ff4d0765a4e30afa659edbf09006987fc62499 (patch) | |
tree | fb9f64c4510ea08e076c715c87dd61b3d79f99d6 /include/acpi/acpi_bus.h | |
parent | 679d9980f9914136f6e488d976eb412de156c542 (diff) | |
parent | 7b98118aaa5d75644c48f41fc5d0cc181e478383 (diff) |
Merge branch 'acpi-hotplug'
* acpi-hotplug:
ACPI / hotplug: Consolidate deferred execution of ACPI hotplug routines
ACPI / hotplug: Do not execute "insert in progress" _OST
ACPI / hotplug: Carry out PCI root eject directly
ACPI / hotplug: Merge device hot-removal routines
ACPI / hotplug: Make acpi_bus_hot_remove_device() internal
ACPI / hotplug: Simplify device ejection routines
ACPI / hotplug: Fix handle_root_bridge_removal()
ACPI / hotplug: Refuse to hot-remove all objects with disabled hotplug
ACPI / scan: Start matching drivers after trying scan handlers
ACPI: Remove acpi_pci_slot_init() headers from internal.h
Conflicts:
include/acpi/acpiosxf.h (with the 'acpica' branch)
Diffstat (limited to 'include/acpi/acpi_bus.h')
-rw-r--r-- | include/acpi/acpi_bus.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 15100f625e65..89c60b0f6408 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -339,20 +339,6 @@ struct acpi_bus_event { | |||
339 | u32 data; | 339 | u32 data; |
340 | }; | 340 | }; |
341 | 341 | ||
342 | struct acpi_eject_event { | ||
343 | struct acpi_device *device; | ||
344 | u32 event; | ||
345 | }; | ||
346 | |||
347 | struct acpi_hp_work { | ||
348 | struct work_struct work; | ||
349 | acpi_handle handle; | ||
350 | u32 type; | ||
351 | void *context; | ||
352 | }; | ||
353 | void alloc_acpi_hp_work(acpi_handle handle, u32 type, void *context, | ||
354 | void (*func)(struct work_struct *work)); | ||
355 | |||
356 | extern struct kobject *acpi_kobj; | 342 | extern struct kobject *acpi_kobj; |
357 | extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); | 343 | extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int); |
358 | void acpi_bus_private_data_handler(acpi_handle, void *); | 344 | void acpi_bus_private_data_handler(acpi_handle, void *); |
@@ -391,7 +377,6 @@ int acpi_scan_add_handler(struct acpi_scan_handler *handler); | |||
391 | int acpi_bus_register_driver(struct acpi_driver *driver); | 377 | int acpi_bus_register_driver(struct acpi_driver *driver); |
392 | void acpi_bus_unregister_driver(struct acpi_driver *driver); | 378 | void acpi_bus_unregister_driver(struct acpi_driver *driver); |
393 | int acpi_bus_scan(acpi_handle handle); | 379 | int acpi_bus_scan(acpi_handle handle); |
394 | void acpi_bus_hot_remove_device(void *context); | ||
395 | void acpi_bus_trim(struct acpi_device *start); | 380 | void acpi_bus_trim(struct acpi_device *start); |
396 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); | 381 | acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd); |
397 | int acpi_match_device_ids(struct acpi_device *device, | 382 | int acpi_match_device_ids(struct acpi_device *device, |
@@ -399,6 +384,9 @@ int acpi_match_device_ids(struct acpi_device *device, | |||
399 | int acpi_create_dir(struct acpi_device *); | 384 | int acpi_create_dir(struct acpi_device *); |
400 | void acpi_remove_dir(struct acpi_device *); | 385 | void acpi_remove_dir(struct acpi_device *); |
401 | 386 | ||
387 | typedef void (*acpi_hp_callback)(void *data, u32 src); | ||
388 | |||
389 | acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src); | ||
402 | 390 | ||
403 | /** | 391 | /** |
404 | * module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver | 392 | * module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver |