ACPI / dock / PCI: Drop ACPI dock notifier chain

The only user of the ACPI dock notifier chain is the ACPI-based PCI
hotplug (acpiphp) driver that uses it to carry out post-dock fixups
needed by some systems with broken _DCK.  However, it is not
necessary to use a separate notifier chain for that, as it can be
simply replaced with a new callback in struct acpi_dock_ops.

For this reason, add a new .fixup() callback to struct acpi_dock_ops
and make hotplug_dock_devices() execute it for all dock devices with
hotplug operations registered.  Accordingly, make acpiphp point that
callback to the function carrying out the post-dock fixups and
do not register a separate dock notifier for each device
registering dock operations.  Finally, drop the ACPI dock notifier
chain that has no more users.

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

1 files changed, 4 insertions, 14 deletions

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index a0a7133a1d12..8bfad0dc29ab 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -119,15 +119,14 @@ static void free_bridge(struct kref *kref)
  * TBD - figure out a way to only call fixups for
  * systems that require them.
  */
-static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
-        void *v)
+static void post_dock_fixups(acpi_handle not_used, u32 event, void *data)
 {
-        struct acpiphp_func *func = container_of(nb, struct acpiphp_func, nb);
+        struct acpiphp_func *func = data;
         struct pci_bus *bus = func->slot->bridge->pci_bus;
         u32 buses;
 
         if (!bus->self)
-                return  NOTIFY_OK;
+                return;
 
         /* fixup bad _DCK function that rewrites
          * secondary bridge on slot
@@ -143,11 +142,11 @@ static int post_dock_fixups(struct notifier_block *nb, unsigned long val,
                         | ((unsigned int)(bus->busn_res.end) << 16);
                 pci_write_config_dword(bus->self, PCI_PRIMARY_BUS, buses);
         }
-        return NOTIFY_OK;
 }
 
 
 static const struct acpi_dock_ops acpiphp_dock_ops = {
+        .fixup = post_dock_fixups,
         .handler = hotplug_event_func,
 };
 
@@ -315,14 +314,6 @@ register_slot(acpi_handle handle, u32 lvl, void *context, void **rv)
                         &acpiphp_dock_ops, newfunc,
                         acpiphp_dock_init, acpiphp_dock_release))
                         dbg("failed to register dock device\n");
-
-                /* we need to be notified when dock events happen
-                 * outside of the hotplug operation, since we may
-                 * need to do fixups before we can hotplug.
-                 */
-                newfunc->nb.notifier_call = post_dock_fixups;
-                if (register_dock_notifier(&newfunc->nb))
-                        dbg("failed to register a dock notifier");
         }
 
         /* install notify handler */
@@ -472,7 +463,6 @@ static void cleanup_bridge(struct acpiphp_bridge *bridge)
                 list_for_each_entry(func, &slot->funcs, sibling) {
                         if (is_dock_device(func->handle)) {
                                 unregister_hotplug_dock_device(func->handle);
-                                unregister_dock_notifier(&func->nb);
                         }
                         if (!(func->flags & FUNC_HAS_DCK)) {
                                 status = acpi_remove_notify_handler(func->handle,