Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 21:02:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACPI: battery: use driver core managed async probing

Browse Source 
In commit 0f66af5301 ("ACPI: battery: asynchronous init") the ACPI
battery driver switched to a custom async driver probing to avoid
delaying the system boot.

In the meantime the driver core gained its own async probing logic for
"slow devices which probing order is not essential for booting the system".
Switch over to the core logic and drop the custom one.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Link: https://patch.msgid.link/20240903-acpi-battery-async-v1-1-e4deb74fcdba@weissschuh.net
[ rjw: Changelog edit ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Thomas Weißschuh 2024-09-03 23:20:46 +02:00 committed by Rafael J. Wysocki
parent 3745de7f2d
commit eea3d532d8
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/acpi/battery.c
View File

@ -10,7 +10,6 @@
#define pr_fmt(fmt) "ACPI: battery: " fmt #define pr_fmt(fmt) "ACPI: battery: " fmt
#include <linux/async.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
@ -50,8 +49,6 @@ MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>");
MODULE_DESCRIPTION("ACPI Battery Driver"); MODULE_DESCRIPTION("ACPI Battery Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static async_cookie_t async_cookie;
static bool battery_driver_registered;
static int battery_bix_broken_package; static int battery_bix_broken_package;
static int battery_notification_delay_ms; static int battery_notification_delay_ms;
static int battery_ac_is_broken; static int battery_ac_is_broken;
@ -1311,37 +1308,23 @@ static struct acpi_driver acpi_battery_driver = {
.remove = acpi_battery_remove, .remove = acpi_battery_remove,
}, },
.drv.pm = &acpi_battery_pm, .drv.pm = &acpi_battery_pm,
.drv.probe_type = PROBE_PREFER_ASYNCHRONOUS,
}; };
static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie)
{
int result;
if (acpi_quirk_skip_acpi_ac_and_battery())
return;
dmi_check_system(bat_dmi_table);
result = acpi_bus_register_driver(&acpi_battery_driver);
battery_driver_registered = (result == 0);
}
static int __init acpi_battery_init(void) static int __init acpi_battery_init(void)
{ {
if (acpi_disabled) if (acpi_disabled || acpi_quirk_skip_acpi_ac_and_battery())
return -ENODEV; return -ENODEV;
async_cookie = async_schedule(acpi_battery_init_async, NULL); dmi_check_system(bat_dmi_table);
return 0;
return acpi_bus_register_driver(&acpi_battery_driver);
} }
static void __exit acpi_battery_exit(void) static void __exit acpi_battery_exit(void)
{ {
async_synchronize_cookie(async_cookie + 1); acpi_bus_unregister_driver(&acpi_battery_driver);
if (battery_driver_registered) { battery_hook_exit();
acpi_bus_unregister_driver(&acpi_battery_driver);
battery_hook_exit();
}
} }
module_init(acpi_battery_init); module_init(acpi_battery_init);