[PATCH] acpi hotplug: clean up notify handlers on acpiphp unload

A root bridge may not have directly attached hotpluggable slots under it.
Instead, it may have p2p bridges with slots under it.  In this case, we need
to clean up the p2p bridges and slots properly too.  Patch below applies on
top of the original patch, and fixes this problem.  Without this, acpiphp
leaves behind notify handlers on module unload, and subsequent module load
attempts don't work properly too.  Patch was tested on an ia64 Tiger4 box.

Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 41c3eb28b69df7b80bf664d2fe543b524a5f603d..2f72e50eca2feaa71a1b63ff7dbbc640854d41a7 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -487,18 +487,12 @@ static struct acpiphp_bridge *acpiphp_handle_to_bridge(acpi_handle handle)
        return NULL;
 }
 
-static void remove_bridge(acpi_handle handle)
+static void cleanup_bridge(struct acpiphp_bridge *bridge)
 {
        struct list_head *list, *tmp;
-       struct acpiphp_bridge *bridge;
        struct acpiphp_slot *slot;
        acpi_status status;
-
-       bridge = acpiphp_handle_to_bridge(handle);
-       if (!bridge) {
-               err("Could not find bridge for handle %p\n", handle);
-               return;
-       }
+       acpi_handle handle = bridge->handle;
 
        status = acpi_remove_notify_handler(handle, ACPI_SYSTEM_NOTIFY,
                                            handle_hotplug_event_bridge);
@@ -529,6 +523,30 @@ static void remove_bridge(acpi_handle handle)
        kfree(bridge);
 }
 
+static acpi_status
+cleanup_p2p_bridge(acpi_handle handle, u32 lvl, void *context, void **rv)
+{
+       struct acpiphp_bridge *bridge;
+
+       if (!(bridge = acpiphp_handle_to_bridge(handle)))
+               return AE_OK;
+       cleanup_bridge(bridge);
+       return AE_OK;
+}
+
+static void remove_bridge(acpi_handle handle)
+{
+       struct acpiphp_bridge *bridge;
+
+       bridge = acpiphp_handle_to_bridge(handle);
+       if (bridge) {
+               cleanup_bridge(bridge);
+       } else {
+               /* clean-up p2p bridges under this host bridge */
+               acpi_walk_namespace(ACPI_TYPE_DEVICE, handle,
+                               (u32)1, cleanup_p2p_bridge, NULL, NULL);
+       }
+}
 
 static int power_on_slot(struct acpiphp_slot *slot)
 {