ACPI / hotplug / PCI: Do not clear event callback pointer for docks
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:08:42 +0000 (01:08 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 21 Feb 2014 00:08:42 +0000 (01:08 +0100)
After recent changes adding dock station handling to the ACPI hotplug
core, it is not necessary to clear the .event() pointer in the
ACPIPHP device hotplug context for dock stations any more, so don't
do that.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/pci/hotplug/acpiphp_glue.c

index 91276f9fe26889f14c6a3e814b4495443aaa1bcb..db81412cacb0e75dad77ad4f52a63a06bff003b0 100644 (file)
@@ -304,13 +304,6 @@ static acpi_status register_slot(acpi_handle handle, u32 lvl, void *data,
        if (acpi_has_method(handle, "_STA"))
                newfunc->flags |= FUNC_HAS_STA;
 
-       /*
-        * Dock stations' notify handler should be used for dock devices instead
-        * of the common one, so clear hp.event in their contexts.
-        */
-       if (acpi_has_method(handle, "_DCK"))
-               context->hp.event = NULL;
-
        acpi_unlock_hp_context();
 
        /* search for objects that share the same slot */