Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
From:   Armin Wolf <W_Armin@gmx.de>
To:     wilken.gottwalt@posteo.net
Cc:     jdelvare@suse.com, linux@roeck-us.net, linux-hwmon@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH] hwmon: (corsair-psu) Fix probe when built-in
Date:   Thu,  7 Dec 2023 22:07:23 +0100
Message-Id: <20231207210723.222552-1-W_Armin@gmx.de>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:vHqp8faGvxk=;VPD02ArP9LJBfdJYyRNb5iGd9bE
 oYy6JcnGI+jpPnZpbLXra+I1k2Un/Q1ODq2DVk8tLB2ed70csY6c25QEwDfs7XxXrbrOCGh0O
 GPz4uLcOi3WtRi25MeKybEWbd5FDX6aGdIM1J5qjIKUqqlO29UX8D5YCE1Q9Am/ayaipPJ7bN
 HTjAiwWmZFPwPqpb+QpCjfK4A2UQDbwVC6ZvruHkmy3fv5YFJIBoZdzUBKseoIShG+ZErsX1n
 8dFQA0enQNcxvs6FNTaqncO88dRzYNhPs1x+9D6QVa8Th4fRR4+UlHTXr0WMrZxDCBJ4J7FGU
 5hxGXdEd9Lxu2UFalqL6xjiZrJNnQHjVjQrmjr1BH1nQYwcOGHPh3/2NcQLr0H6Zl5f/JlvWU
 PoY+KaePeIWKp2T+FtYXBFWEZlz3wWud5yyrs7cPw1J8XuTwHJXXkfPyU0TGkTa496eH8QZtx
 QHUF/bDoAEdMaiT19EBUFdTvVvkI4zL1VgL8uC5LSiILE51v7akzZNcZYcTrmG3pzbJU42IzC
 Am+YGAJnpnNf0reyQqxnn7WZWuKmzCX0vff8Tu1CNk4Zc4+PRXzqL4wan3IwQpnxKwg/8UH7U
 j0mvhebBv5mu6hS9HYRon3aA1oTXho4wklEYioWrIM3GoaSxpOlU7w/9Jbw/vuB8i8tr8wHRN
 mroiAiEB59QQkXYglyaH4qZxJAJbBRZFyVzLU/thihY5V9u0V0aaotB7vWxvBFuC+Bi74bTJs
 7AhGOrq6iFPfWo3yhAbvNIvMZYwuv1PSSEsN8PGmU/tp5P4RpQkyVXX+/s+aTeift0tU8EGtT
 CD3Z4j9Zfix4OpxfirbLI1nHpysPks9NKrTUIFlo2B8jtZyYRQgBc1kx4y1Dksn3HtEZ4uNht
 zfafgsISWG98Q/KCMk5n3rOfESqg0iVYwGea9B5DAKvp65Q+yRhVdVjP9/SkYojVq0tdBhhnO
 6BomVApjEXey2XIZ+ooT+kzOySQ=
Precedence: bulk

It seems that when the driver is built-in, the HID bus is
initialized after the driver is loaded, which whould cause
module_hid_driver() to fail.
Fix this by registering the driver after the HID bus using
late_initcall() in accordance with other hwmon HID drivers.

Compile-tested only.

Signed-off-by: Armin Wolf <W_Armin@gmx.de>
=2D--
 drivers/hwmon/corsair-psu.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/drivers/hwmon/corsair-psu.c b/drivers/hwmon/corsair-psu.c
index 904890598c11..2c7c92272fe3 100644
=2D-- a/drivers/hwmon/corsair-psu.c
+++ b/drivers/hwmon/corsair-psu.c
@@ -899,7 +899,23 @@ static struct hid_driver corsairpsu_driver =3D {
 	.reset_resume	=3D corsairpsu_resume,
 #endif
 };
-module_hid_driver(corsairpsu_driver);
+
+static int __init corsair_init(void)
+{
+	return hid_register_driver(&corsairpsu_driver);
+}
+
+static void __exit corsair_exit(void)
+{
+	hid_unregister_driver(&corsairpsu_driver);
+}
+
+/*
+ * With module_init() the driver would load before the HID bus when
+ * built-in, so use late_initcall() instead.
+ */
+late_initcall(corsair_init);
+module_exit(corsair_exit);

 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Wilken Gottwalt <wilken.gottwalt@posteo.net>");
=2D-
2.39.2