summaryrefslogtreecommitdiff
path: root/drivers/pci/hotplug
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-21 00:08:42 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-02-21 00:08:42 (GMT)
commitd7c7c0256b936901eb7a70fbc6d674a6bdfd463e (patch)
tree480531defa1c1b2024e02c7b75bf58bb78e57596 /drivers/pci/hotplug
parentaf8874491de6f03237df5e20d87324cbbe226f19 (diff)
downloadlinux-d7c7c0256b936901eb7a70fbc6d674a6bdfd463e.tar.xz
ACPI / hotplug / PCI: Do not clear event callback pointer for docks
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>
Diffstat (limited to 'drivers/pci/hotplug')
-rw-r--r--drivers/pci/hotplug/acpiphp_glue.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 91276f9..db81412 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -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 */