ACPI / dock: Add .uevent() callback to struct acpi_hotplug_context

In order to avoid the need to register special ACPI dock
operations for SATA devices add a .uevent() callback pointer to
struct acpi_hotplug_context and make dock_hotplug_event() use that
callback if available.  Also rename the existing .event() callback
in struct acpi_hotplug_context to .notify() to avoid possible
confusion in the future.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 78c4ee7a422ebc2673f245f091bc04fa9e650f19..a88fad9ff2346a62d1ee3e8fc4ad38c643b40fcc 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -203,10 +203,19 @@ static void dock_hotplug_event(struct dock_dependent_device *dd, u32 event,
                        fixup(adev);
                        return;
                }
+       } else if (cb_type == DOCK_CALL_UEVENT) {
+               void (*uevent)(struct acpi_device *, u32);
+
+               uevent = adev->hp->uevent;
+               if (uevent) {
+                       acpi_unlock_hp_context();
+                       uevent(adev, event);
+                       return;
+               }
        } else {
                int (*notify)(struct acpi_device *, u32);
 
-               notify = adev->hp->event;
+               notify = adev->hp->notify;
                if (notify) {
                        acpi_unlock_hp_context();
                        notify(adev, event);

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 518aae461a00f6549a66b3117b1843e64bcc5bc7..e7d951032f853e47a2243eb968be8a85d313dd52 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -496,17 +496,17 @@ void acpi_device_hotplug(void *data, u32 src)
                        goto err_out;
                }
        } else {
-               int (*event)(struct acpi_device *, u32);
+               int (*notify)(struct acpi_device *, u32);
 
                acpi_lock_hp_context();
-               event = adev->hp ? adev->hp->event : NULL;
+               notify = adev->hp ? adev->hp->notify : NULL;
                acpi_unlock_hp_context();
                /*
                 * There may be additional notify handlers for device objects
                 * without the .event() callback, so ignore them here.
                 */
-               if (event)
-                       error = event(adev, src);
+               if (notify)
+                       error = notify(adev, src);
                else
                        goto out;
        }

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 15865aeebbb53d06f0f8f1ad46987a71ebb520cc..a92b8b017901facc8b5e172b60ee28398157f6d7 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -59,7 +59,7 @@
 static LIST_HEAD(bridge_list);
 static DEFINE_MUTEX(bridge_mutex);
 
-static int acpiphp_hotplug_event(struct acpi_device *adev, u32 type);
+static int acpiphp_hotplug_notify(struct acpi_device *adev, u32 type);
 static void acpiphp_post_dock_fixup(struct acpi_device *adev);
 static void acpiphp_sanitize_bus(struct pci_bus *bus);
 static void acpiphp_set_hpp_values(struct pci_bus *bus);
@@ -81,7 +81,7 @@ 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_event,
+       acpi_set_hp_context(adev, &context->hp, acpiphp_hotplug_notify, NULL,
                            acpiphp_post_dock_fixup);
        return context;
 }
@@ -400,7 +400,7 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)
                        struct acpi_device *adev = func_to_acpi_device(func);
 
                        acpi_lock_hp_context();
-                       adev->hp->event = NULL;
+                       adev->hp->notify = NULL;
                        adev->hp->fixup = NULL;
                        acpi_unlock_hp_context();
                }
@@ -833,7 +833,7 @@ static void hotplug_event(u32 type, struct acpiphp_context *context)
                put_bridge(bridge);
 }
 
-static int acpiphp_hotplug_event(struct acpi_device *adev, u32 type)
+static int acpiphp_hotplug_notify(struct acpi_device *adev, u32 type)
 {
        struct acpiphp_context *context;
 

diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
index 007fe99e29f51cbdc886f34861c6c3cd13eb4d64..738278606677cfeddcdbbb164b4879e5aed5ab09 100644 (file)
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
@@ -143,7 +143,8 @@ struct acpi_scan_handler {
 
 struct acpi_hotplug_context {
        struct acpi_device *self;
-       int (*event)(struct acpi_device *, u32);
+       int (*notify)(struct acpi_device *, u32);
+       void (*uevent)(struct acpi_device *, u32);
        void (*fixup)(struct acpi_device *);
 };
 
@@ -367,11 +368,13 @@ 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 (*notify)(struct acpi_device *, u32),
+                                      void (*uevent)(struct acpi_device *, u32),
                                       void (*fixup)(struct acpi_device *))
 {
        hp->self = adev;
-       hp->event = event;
+       hp->notify = notify;
+       hp->uevent = uevent;
        hp->fixup = fixup;
        adev->hp = hp;
 }