platform/x86: wmi: Remove ACPI handlers after WMI devices

When removing the ACPI notify/address space handlers, the WMI devices
are still active and might still depend on ACPI EC access or
WMI events.
Fix this by removing the ACPI handlers after all WMI devices
associated with an ACPI device have been removed.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Armin Wolf <W_Armin@gmx.de>
Link: https://lore.kernel.org/r/20231218192420.305411-3-W_Armin@gmx.de
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 906d3a2831ae200083da8b26c36f8befe4c94417..2120c13e1676bea81f579fc8ca9ffe84de44f47b 100644 (file)
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1239,13 +1239,12 @@ static void acpi_wmi_remove(struct platform_device *device)
        struct acpi_device *acpi_device = ACPI_COMPANION(&device->dev);
        struct device *wmi_bus_device = dev_get_drvdata(&device->dev);
 
-       acpi_remove_notify_handler(acpi_device->handle, ACPI_ALL_NOTIFY,
-                                  acpi_wmi_notify_handler);
-       acpi_remove_address_space_handler(acpi_device->handle,
-                               ACPI_ADR_SPACE_EC, &acpi_wmi_ec_space_handler);
-
        device_for_each_child_reverse(wmi_bus_device, NULL, wmi_remove_device);
        device_unregister(wmi_bus_device);
+
+       acpi_remove_notify_handler(acpi_device->handle, ACPI_ALL_NOTIFY, acpi_wmi_notify_handler);
+       acpi_remove_address_space_handler(acpi_device->handle, ACPI_ADR_SPACE_EC,
+                                         &acpi_wmi_ec_space_handler);
 }
 
 static int acpi_wmi_probe(struct platform_device *device)