Received-SPF: pass (google.com: domain of linux-kernel+bounces-1942-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 4/6] platform/x86: wmi: Create WMI bus device first
Date: Sat, 16 Dec 2023 02:55:59 +0100
Message-Id: <20231216015601.395118-5-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:XSs2184x+uQ=;IMc4kWXI1OoG3Wj4ME7//yyKABh
 4u34exp+qKQJJsGJHOnon6yhF+jEmCFw0rACVzLmfI1YY+01vFB0SBl6JuGWzijPIsVS8g9Gf
 AVBy8lsRLIN2zWlTAZLkHAZ1GekZ6EPIsS09QkT+WcxLGr5ePIE/epe3z29yrz4kkRdTlABLs
 /jZ318vaPFWwJyBnLqLisewk6wepmZvSXcN7bRXI3V4kuDPNn2zZ07168K3mtzkRLW3vtUg7G
 VIWe1fTppSvCPdN3E8EwCo+EDaVxnt2y275QrYywdsEbuuOY5dVUhdnRdiNPi37Thyu2ADMs4
 VvQaPa0wotbZOo1QAq46/VP6NT73snEa8Pz2F7YvA0uBb3E5ySpjDxPvSo4YichI2mG9I4rQp
 zqLam9echWLnSw4j49tlXEkbz/czZ2XoQ6AR9XN2vdDbEtVoBkHQ4nBkZNPZbT68wmPhw8R7s
 QnGLpcfEygLsPT0vsH8nKruRnD51Lux+5scEweYXBKQDDAAz2fzWX7X2+ds9zYOioD7Yf4oE/
 P7/Ldh85yor9qa4YJbmIuPMFdXUPTHApsQ5o4vjB+7CIVP+M/cJkOJbJ6odpBUhJ5nJhl60+R
 JV7CxYG6I2zm7D1vz2yiWIBP6nFJ+AGQT+28QM85H3QEPXjfEQ3U1xPkQod+17H6dCdp0x0UP
 +TcIrWX1zXqj/PtBvJ5oIHlvWXQGZ0Cwf0ShD84n4RFUUHPodgRbePhnrqJjrGtpnc0WPtj6m
 rdNCszHSDSQU+RZNcYwBEe8NMxeIs58dyVd8+V9WKMYKxari5sLEYzIqgIbGKg3mw5R6NoPAo
 Sp+oDUuvKGXO5IcT1ENUdmul5caZ4awjQxGe0GKk8/62ynSHSaiLxfEj+3hpjFoBYhQ31NbTm
 pF6lYM/ctgBK4a5v/JiJnEKQIXeTAXxxyij3L/Skiffgrb2N0v9ifCt+YSZbNanBMiPuWsI4U
 E7L/e+CQbOyVuoWo6v5+jJQou4M=

Create the WMI bus device first so that it can be used
by the ACPI handlers.

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

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 4306a5533842..61849a43e2c2 100644
=2D-- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -1276,6 +1276,17 @@ static int acpi_wmi_probe(struct platform_device *d=
evice)
 		return -ENODEV;
 	}

+	wmi_bus_dev =3D device_create(&wmi_bus_class, &device->dev, MKDEV(0, 0),=
 NULL, "wmi_bus-%s",
+				    dev_name(&device->dev));
+	if (IS_ERR(wmi_bus_dev))
+		return PTR_ERR(wmi_bus_dev);
+
+	error =3D devm_add_action_or_reset(&device->dev, acpi_wmi_remove_bus_dev=
ice, wmi_bus_dev);
+	if (error < 0)
+		return error;
+
+	dev_set_drvdata(&device->dev, wmi_bus_dev);
+
 	status =3D acpi_install_address_space_handler(acpi_device->handle,
 						    ACPI_ADR_SPACE_EC,
 						    &acpi_wmi_ec_space_handler,
@@ -1302,17 +1313,6 @@ static int acpi_wmi_probe(struct platform_device *d=
evice)
 	if (error < 0)
 		return error;

-	wmi_bus_dev =3D device_create(&wmi_bus_class, &device->dev, MKDEV(0, 0),
-				    NULL, "wmi_bus-%s", dev_name(&device->dev));
-	if (IS_ERR(wmi_bus_dev)) {
-		return PTR_ERR(wmi_bus_dev);
-	}
-	error =3D devm_add_action_or_reset(&device->dev, acpi_wmi_remove_bus_dev=
ice, wmi_bus_dev);
-	if (error < 0)
-		return error;
-
-	dev_set_drvdata(&device->dev, wmi_bus_dev);
-
 	error =3D parse_wdg(wmi_bus_dev, device);
 	if (error) {
 		pr_err("Failed to parse WDG method\n");
=2D-
2.39.2