aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-15 16:03:22 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-07-15 19:45:40 -0400
commitba574dc8563c7c1d1d1c5bf3c1c99ec88513402e (patch)
tree61f5d7b347d8f05d11bf27bf952a32502c3e0b56
parent86f5f3ca49e3d20c1a5e83917b2c8b98a7c95506 (diff)
ACPI / hotplug: Simplify acpi_set_hp_context()
Since all of the acpi_set_hp_context() callers pass at least one NULL function pointer and one caller passes NULL function pointers only to it, drop function pointer arguments from acpi_set_hp_context() and make the callers initialize the function pointers in struct acpi_hotplug_context by themselves before passing it to acpi_set_hp_context(). Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Bjorn Helgaas <bhelgaas@google.com>
-rw-r--r--drivers/acpi/scan.c4
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c7
-rw-r--r--include/acpi/acpi_bus.h8
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,
77 void (*uevent)(struct acpi_device *, u32)) 77 void (*uevent)(struct acpi_device *, u32))
78{ 78{
79 acpi_lock_hp_context(); 79 acpi_lock_hp_context();
80 acpi_set_hp_context(adev, hp, notify, uevent, NULL); 80 hp->notify = notify;
81 hp->uevent = uevent;
82 acpi_set_hp_context(adev, hp);
81 acpi_unlock_hp_context(); 83 acpi_unlock_hp_context();
82} 84}
83EXPORT_SYMBOL_GPL(acpi_initialize_hp_context); 85EXPORT_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)
80 return NULL; 80 return NULL;
81 81
82 context->refcount = 1; 82 context->refcount = 1;
83 acpi_set_hp_context(adev, &context->hp, acpiphp_hotplug_notify, NULL, 83 context->hp.notify = acpiphp_hotplug_notify;
84 acpiphp_post_dock_fixup); 84 context->hp.fixup = acpiphp_post_dock_fixup;
85 acpi_set_hp_context(adev, &context->hp);
85 return context; 86 return context;
86} 87}
87 88
@@ -876,7 +877,7 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
876 goto err; 877 goto err;
877 878
878 root_context->root_bridge = bridge; 879 root_context->root_bridge = bridge;
879 acpi_set_hp_context(adev, &root_context->hp, NULL, NULL, NULL); 880 acpi_set_hp_context(adev, &root_context->hp);
880 } else { 881 } else {
881 struct acpiphp_context *context; 882 struct acpiphp_context *context;
882 883
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)
372} 372}
373 373
374static inline void acpi_set_hp_context(struct acpi_device *adev, 374static inline void acpi_set_hp_context(struct acpi_device *adev,
375 struct acpi_hotplug_context *hp, 375 struct acpi_hotplug_context *hp)
376 int (*notify)(struct acpi_device *, u32),
377 void (*uevent)(struct acpi_device *, u32),
378 void (*fixup)(struct acpi_device *))
379{ 376{
380 hp->self = adev; 377 hp->self = adev;
381 hp->notify = notify;
382 hp->uevent = uevent;
383 hp->fixup = fixup;
384 adev->hp = hp; 378 adev->hp = hp;
385} 379}
386 380