Received-SPF: pass (google.com: domain of linux-kernel+bounces-4320-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
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:55:27 +0100
Message-Id: <20231218195531.311179-3-W_Armin@gmx.de>
In-Reply-To: <20231218195531.311179-1-W_Armin@gmx.de>
References: <20231218195531.311179-1-W_Armin@gmx.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:vbZRc5hIZb4=;AmxXZ3DRZnAeljagOPAQiu3ggDY
 TAZu9Js+Zo/F5sr5dqfzGCHBGQ1tFYDjDuW79RJj0UTnRgWCU1TTzmWfhjjzG4e+Yiegq9gCi
 oe6adJWB/Nen+LRNKpAi7C53raB3Il+cPba3Wc4tlhmo7zPrVerr5SzItOL09ObJ4xgFLgXGp
 VC0GFea5WX5Tl3nC4bY/f7LeFBI1v80PWsIfjiSJRpvS8GZZiY2DEkjvouDfRPGYjyKLQR6do
 +DQrwi1qeoXuKO6hSGjKTF7g6hTwBeep9rYZzHml4TkTx6H6vnZuPqUUg9tIUU8bJg6pRk05k
 nqO6QLP/l6NwMmjaE8yVJuvjZuqnD7A/oBM+ShmbJfd0BJAKtn08h/fTAZy1S4IHVEt65TBgI
 vWVIdzzbY437qjQknVrnnVAp62g62rcuK0ePVA2nB/L/2wFuAAroLluK503QjayMVWDjrzziG
 3qA/4GOCktXpYfV8mX+onFePr0iQsVkCLzWepQws+gxvQ6ViwOjrwklPwIzoKO0i9AsR1SiLp
 GfAdv+45KnA9gc+0jWaBWAQyM9ovIhno/FIwwzaWdalTkHhVE5HReMXAnI0DXHz239DBmGoO/
 XO+BlfR73ySHpk4D17JKjNccoJhIp5a8syO8VjlsO1YWbQyxEh2WtTrITy+GLY5ygUMo29kCZ
 Wd9s+pk1cJ3tfQ2kTV1l1mQOogHND7KB2gJP5qh4ge9ZPcqELBAbocH4RSALgxbCcKeQYRU2U
 8U0KyDMmE7RfUjNVAcCh1Cf0jwZgTiK6ymnAbjoarLGAoCtusP0bvrrvFM+WHwcneLGDVxDVF
 hCZX8t31mwtGG5OqxnMnIcWq1u8d+Nqy7DvfSK6N4fKiYOoBbciIC/fIPZg1sdCt7fCzV//Q8
 mBzl442sSnYvu9n+h9DxaMHL+k8azgGy2fj6mvYe+gTsQb7zEZZs7tHnMegVWHGvZD8UKMDCC
 fa0T8CS+d59bKpDzsxZTJ/2W1fw=

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