Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
Message-ID: <d91d4bf1-3e8d-4b63-baa9-479a91d04eb7@gmail.com>
Date:   Fri, 8 Dec 2023 14:11:44 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Cc:     savicaleksa83@gmail.com,
        Wilken Gottwalt <wilken.gottwalt@posteo.net>,
        Jean Delvare <jdelvare@suse.com>,
        Guenter Roeck <linux@roeck-us.net>,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] hwmon: (corsair-psu) Fix failure to load when built-in to
 kernel
To:     linux-hwmon@vger.kernel.org
References: <20231208130710.191420-1-savicaleksa83@gmail.com>
Content-Language: en-US
From:   Aleksa Savic <savicaleksa83@gmail.com>
In-Reply-To: <20231208130710.191420-1-savicaleksa83@gmail.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 2023-12-08 14:07:10 GMT+01:00, Aleksa Savic wrote:
> When built-in to the kernel, the corsair-psu driver fails to register with
> the following message:
> 
> "Driver 'corsair-psu' was unable to register with bus_type 'hid'
> because the bus was not initialized."
> 
> Fix this by initializing the driver after the HID bus using
> late_initcall(), as hwmon is built before HID.
> 
> Fixes: d115b51e0e56 ("hwmon: add Corsair PSU HID controller driver")
> Signed-off-by: Aleksa Savic <savicaleksa83@gmail.com>
> ---
>  drivers/hwmon/corsair-psu.c | 15 ++++++++++++++-
>  1 file changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/hwmon/corsair-psu.c b/drivers/hwmon/corsair-psu.c
> index 904890598c11..48831a528965 100644
> --- a/drivers/hwmon/corsair-psu.c
> +++ b/drivers/hwmon/corsair-psu.c
> @@ -899,7 +899,20 @@ static struct hid_driver corsairpsu_driver = {
>  	.reset_resume	= corsairpsu_resume,
>  #endif
>  };
> -module_hid_driver(corsairpsu_driver);
> +
> +static int __init corsairpsu_hid_init(void)
> +{
> +	return hid_register_driver(&corsairpsu_driver);
> +}
> +
> +static void __exit corsairpsu_hid_exit(void)
> +{
> +	hid_unregister_driver(&corsairpsu_driver);
> +}
> +
> +/* When compiled into the kernel, initialize after the hid bus */
> +late_initcall(corsairpsu_hid_init);
> +module_exit(corsairpsu_hid_exit);
>  
>  MODULE_LICENSE("GPL");
>  MODULE_AUTHOR("Wilken Gottwalt <wilken.gottwalt@posteo.net>");


Woops! Just saw that the same fix was sent yesterday. Please disregard, sorry!

Aleksa