Received-SPF: pass (google.com: domain of linux-kernel+bounces-1940-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Armin Wolf <W_Armin@gmx.de>
To: hdegoede@redhat.com,
	ilpo.jarvinen@linux.intel.com
Cc: platform-driver-x86@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH 2/6] platform/x86: wmi: Remove ACPI handlers after WMI devices
Date: Sat, 16 Dec 2023 02:55:57 +0100
Message-Id: <20231216015601.395118-3-W_Armin@gmx.de>
In-Reply-To: <20231216015601.395118-1-W_Armin@gmx.de>
References: <20231216015601.395118-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:BJhUsHRAOvE=;SX/BCMEVCsHQApJnIu1iWpCQOGO
 dxVPopsTPsWNZAJ21Uxj2fhPa5LaeSgm6s7iNeOY9NHCdXbbwwoXguawNHnaaLDZbVCaSWudI
 Y/nxd4S22lZomMZY4I2JgOl96pQs+jehGVchTPHDPazHjoDcHDw92lPh+M1OBntRosMbUnmgJ
 Mx8efMVjcj0NcQqjstzeBlrRI0NF8CzEHTvyP772rhhiXlh+Uc9lzCSnudcFGb6PmkIe6h05q
 2ACp94a5ZQJJwOq/Oy4VeVMNO4pYHQIRYYCNHtvKWizzn8rSVe6S2LMLQ9QIJmEy1PGscmtZT
 4TVaaQbN7I4NefWqs55g5c4FmBDdOHLLhPCIw5JGngoZtojnZee2Vc1yV+fc5mJpKnvzrjGjY
 R8DuYjSw4sbBib4nOakOEYupPSlV/SqRUGxzKm73wEpKvMgg4AufGK1tfzUKBwNupZkOfp2BG
 7PYVV0NEbdJYVKEUCOhnGXXBoPycWtQY3JoGLFuV4bBfamTg93a4cwzi9vz5jS0J2iVTviJqF
 IJcgJFvcOPrsh4LuAhZW6wgUsPoLsLTXxT54uYHgu8mlRPAiruUID9K4wiEC43gkjUOZREo+k
 cWbyshe+9zIixc0V5tCqjLBZFObwl2JS6wFWFhJIXTxX4jyfZupC/dGLsUl3oJ7ZuAXPaz5HU
 EODyvtdtVRzZCCl/Cs839l51GON4CGIy4l19uZRFX8eOJNarCR7qv2+CC0u5iV62rxAuYiqqO
 +gSJHuQGterE0yfuli4TTSC8KmcMHBKPjoSA3dCCawsHYSN+lkT9tysq1cXHeHiwMrbUavn2g
 FrF+vTecJMeEBL9WFpoV+v+vSI7VjvBvQOF0WgMuyfMgZ3B0RkvgRCIrSLi3WJmW/ZZ/MrFg2
 E1hmoXxYc/RfHYsbPBZUDygSbNO8y2gpLQy0dqTj+WqcuQU+30T9wJr6jvnwsLLpFMtk3IlFN
 upzayQ==

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.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 drivers/platform/x86/wmi.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 906d3a2831ae..2120c13e1676 100644
=2D-- 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 =3D ACPI_COMPANION(&device->dev);
 	struct device *wmi_bus_device =3D 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_wm=
i_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)
=2D-
2.39.2