Merge branch 'acpi-hotplug'

* acpi-hotplug:
  ACPI / hotplug: Rework deferred execution of acpi_device_hotplug()
  ACPI / dock: Update copyright notice
  ACPI / dock: Drop remove_dock_dependent_devices()
  ACPI / dock: Drop struct acpi_dock_ops and all code related to it
  ACPI / ATA: Add hotplug contexts to ACPI companions of SATA devices
  ACPI / dock: Add .uevent() callback to struct acpi_hotplug_context
  ACPI / dock: Use callback pointers from devices' ACPI hotplug contexts
  ACPI / dock: Use ACPI device object pointers instead of ACPI handles
  ACPI / hotplug: Add .fixup() callback to struct acpi_hotplug_context
  ACPI / hotplug / PCI: Do not clear event callback pointer for docks
  ACPI / dock: Associate dock platform devices with ACPI device objects
  ACPI / dock: Pass ACPI device pointer to acpi_device_is_battery()
  ACPI / dock: Dispatch dock notifications from the global notify handler

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index fc1aa7909690..afb4be566940 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -1168,8 +1168,7 @@ void acpi_os_wait_events_complete(void)
 
 struct acpi_hp_work {
         struct work_struct work;
-        acpi_hp_callback func;
-        void *data;
+        struct acpi_device *adev;
         u32 src;
 };
 
@@ -1178,25 +1177,24 @@ static void acpi_hotplug_work_fn(struct work_struct *work)
         struct acpi_hp_work *hpw = container_of(work, struct acpi_hp_work, work);
 
         acpi_os_wait_events_complete();
-        hpw->func(hpw->data, hpw->src);
+        acpi_device_hotplug(hpw->adev, hpw->src);
         kfree(hpw);
 }
 
-acpi_status acpi_hotplug_execute(acpi_hp_callback func, void *data, u32 src)
+acpi_status acpi_hotplug_schedule(struct acpi_device *adev, u32 src)
 {
         struct acpi_hp_work *hpw;
 
         ACPI_DEBUG_PRINT((ACPI_DB_EXEC,
-                  "Scheduling function [%p(%p, %u)] for deferred execution.\n",
-                  func, data, src));
+                  "Scheduling hotplug event (%p, %u) for deferred execution.\n",
+                  adev, src));
 
         hpw = kmalloc(sizeof(*hpw), GFP_KERNEL);
         if (!hpw)
                 return AE_NO_MEMORY;
 
         INIT_WORK(&hpw->work, acpi_hotplug_work_fn);
-        hpw->func = func;
-        hpw->data = data;
+        hpw->adev = adev;
         hpw->src = src;
         /*
          * We can't run hotplug code in kacpid_wq/kacpid_notify_wq etc., because