From: Rafael J. Wysocki Date: Fri, 21 Feb 2014 00:08:42 +0000 (+0100) Subject: ACPI / hotplug / PCI: Do not clear event callback pointer for docks X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d7c7c0256b936901eb7a70fbc6d674a6bdfd463e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 --- diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index 91276f9fe268..db81412cacb0 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 */