Merge branch 'acpi-hotplug'

[linux-drm-fsl-dcu.git] / include / acpi / acpi_bus.h

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 15100f625e6550a94bc2afe721ccf3804a2360d5..89c60b0f640819c7ed93b40774d5b9c3f3cbadfb 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -339,20 +339,6 @@ struct acpi_bus_event {
        u32 data;
 };
 
-struct acpi_eject_event {
-       struct acpi_device      *device;
-       u32             event;
-};
-
-struct acpi_hp_work {
-       struct work_struct work;
-       acpi_handle handle;
-       u32 type;
-       void *context;
-};
-void alloc_acpi_hp_work(acpi_handle handle, u32 type, void *context,
-                       void (*func)(struct work_struct *work));
-
 extern struct kobject *acpi_kobj;
 extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
 void acpi_bus_private_data_handler(acpi_handle, void *);
@@ -391,7 +377,6 @@ int acpi_scan_add_handler(struct acpi_scan_handler *handler);
 int acpi_bus_register_driver(struct acpi_driver *driver);
 void acpi_bus_unregister_driver(struct acpi_driver *driver);
 int acpi_bus_scan(acpi_handle handle);
-void acpi_bus_hot_remove_device(void *context);
 void acpi_bus_trim(struct acpi_device *start);
 acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
 int acpi_match_device_ids(struct acpi_device *device,
@@ -399,6 +384,9 @@ int acpi_match_device_ids(struct acpi_device *device,
 int acpi_create_dir(struct acpi_device *);
 void acpi_remove_dir(struct acpi_device *);
 
+typedef void (*acpi_hp_callback)(void *data, u32 src);
+
+acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src);
 
 /**
  * module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver