ACPI / hotplug: Add .fixup() callback to struct acpi_hotplug_context

[mirror_ubuntu-bionic-kernel.git] / include / acpi / acpi_bus.h

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 907d5078f78a52c934fa45962db2df58ac75b995..007fe99e29f51cbdc886f34861c6c3cd13eb4d64 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -144,6 +144,7 @@ struct acpi_scan_handler {
 struct acpi_hotplug_context {
        struct acpi_device *self;
        int (*event)(struct acpi_device *, u32);
+       void (*fixup)(struct acpi_device *);
 };
 
 /*
@@ -201,7 +202,8 @@ struct acpi_device_flags {
        u32 visited:1;
        u32 no_hotplug:1;
        u32 hotplug_notify:1;
-       u32 reserved:23;
+       u32 is_dock_station:1;
+       u32 reserved:22;
 };
 
 /* File System */
@@ -365,10 +367,12 @@ static inline void acpi_set_device_status(struct acpi_device *adev, u32 sta)
 
 static inline void acpi_set_hp_context(struct acpi_device *adev,
                                       struct acpi_hotplug_context *hp,
-                                      int (*event)(struct acpi_device *, u32))
+                                      int (*event)(struct acpi_device *, u32),
+                                      void (*fixup)(struct acpi_device *))
 {
        hp->self = adev;
        hp->event = event;
+       hp->fixup = fixup;
        adev->hp = hp;
 }
 
@@ -446,8 +450,6 @@ static inline bool acpi_device_enumerated(struct acpi_device *adev)
 typedef void (*acpi_hp_callback)(void *data, u32 src);
 
 acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src);
-void acpi_install_hotplug_notify_handler(acpi_handle handle);
-void acpi_remove_hotplug_notify_handler(acpi_handle handle);
 
 /**
  * module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver