3 files changed, 8 insertions, 11 deletions

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index f775fa0d850f..3ffc9306538b 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -77,7 +77,9 @@ void acpi_initialize_hp_context(struct acpi_device *adev,
                                 void (*uevent)(struct acpi_device *, u32))
 {
         acpi_lock_hp_context();
-        acpi_set_hp_context(adev, hp, notify, uevent, NULL);
+        hp->notify = notify;
+        hp->uevent = uevent;
+        acpi_set_hp_context(adev, hp);
         acpi_unlock_hp_context();
 }
 EXPORT_SYMBOL_GPL(acpi_initialize_hp_context);
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 08043f9c1dd5..24a43d4e9933 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -80,8 +80,9 @@ static struct acpiphp_context *acpiphp_init_context(struct acpi_device *adev)
                 return NULL;
 
         context->refcount = 1;
-        acpi_set_hp_context(adev, &context->hp, acpiphp_hotplug_notify, NULL,
-                            acpiphp_post_dock_fixup);
+        context->hp.notify = acpiphp_hotplug_notify;
+        context->hp.fixup = acpiphp_post_dock_fixup;
+        acpi_set_hp_context(adev, &context->hp);
         return context;
 }
 
@@ -876,7 +877,7 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
                         goto err;
 
                 root_context->root_bridge = bridge;
-                acpi_set_hp_context(adev, &root_context->hp, NULL, NULL, NULL);
+                acpi_set_hp_context(adev, &root_context->hp);
         } else {
                 struct acpiphp_context *context;
 
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index b5714580801a..e0720a569b2c 100644
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -372,15 +372,9 @@ 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 (*notify)(struct acpi_device *, u32),
-                                       void (*uevent)(struct acpi_device *, u32),
-                                       void (*fixup)(struct acpi_device *))
+                                       struct acpi_hotplug_context *hp)
 {
         hp->self = adev;
-        hp->notify = notify;
-        hp->uevent = uevent;
-        hp->fixup = fixup;
         adev->hp = hp;
 }