Received-SPF: pass (google.com: domain of linux-kernel+bounces-4287-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
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 v2 2/6] platform/x86: wmi: Remove ACPI handlers after WMI devices
Date: Mon, 18 Dec 2023 20:24:16 +0100
Message-Id: <20231218192420.305411-3-W_Armin@gmx.de>
In-Reply-To: <20231218192420.305411-1-W_Armin@gmx.de>
References: <20231218192420.305411-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:apKLZAJ+RBk=;brH1j7rxmEpyoEn06tIqzwDUTTE
 34/MWNODS5IRGY7ah3lbdEvKJtdQzuB0MQX/pj9IzN21z5e6aUbF17a8/vKBlPsYfb+vlwM9g
 Dfd8ySGgVYUjPMA8GAafSDDHb2RTqr24lO3Gl91quaSP8VtXhaRSrK8bn8fVcb8tCfzz/LcHx
 B/SC3XZE2Xm5ukr40+E5Q3vdlHo3qfFMsWVvQ9MAptvzhyzbSDgJyUoVjncJOBvNR6kBdBkTr
 jgCE1u6tntf0HTPpswAYyJ+6jcgf6a8IEKFJgjNlHu7F1oQES9s9xGxxcb19veo+RP+nOkt1p
 d3iBT7KYErEvUmLYZaApVAJSmA315LUtJsdTJE+jPsrviMuMt6tN7r7heJ0thVJw+Yd6qIxen
 APti9fK6RQfnnwQQaDKCVp72CbBziNVNBmjBei/hF78mQn1siq0vWy02cuBtjB41RU3WCXecT
 dRHxvdXedBsT67v/reBMOVjOLUxR23JZGZOV6VEkriaxwhvBZwNTPrUEymEkFpU5Hsxwyecyx
 zGKu8hWa7rzV6ZBYBi7410Jh+FK3cpevo2jXb20d17fZdDwBVhjHRPZdfdxhOvuBiIw7K0l3d
 nMM0GPXElLTvA/yc1kUwaNXhqyCG74Jk2o270GGUIAT0IyuCNJI5msRX3YOCAG1tWR56m2GJx
 N30+tu1XE+lvHJrGnPlQlFgDTe57JBYkWerFGeqrP9RHoSDD3PX+hK6EVciqtdMG/OLsXSiGg
 dEMm1kjdcMk/WW45vkZU50qzEnx2aeht9GxKBwh8KWROnaL7HQHiogbM+zvfzYuObIVNoOV4i
 qUo3QATwC74qn+GXvB7qssCc0gsuLJfAgF1ca4IcLbgErrLrOri7ABt0ayTxpJwrW1RxPtlWN
 nPm5ScaTGSOQWe04GrynFBHMg/icnm7nIqgAVA27cnilZkJOW7QlwW6ikYeSd4On4kYRvp+Ga
 TZqi3w==

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>
=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