]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
ACPI: battery: Register power supply with power_supply_register()
authorThomas Weißschuh <linux@weissschuh.net>
Sat, 5 Oct 2024 10:05:04 +0000 (12:05 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Tue, 15 Oct 2024 20:22:20 +0000 (22:22 +0200)
power_supply_register_no_ws() is going to be removed.
Switch to the general registration API.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Reviewed-by: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20241005-power-supply-no-wakeup-source-v1-2-1d62bf9bcb1d@weissschuh.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/acpi/battery.c

index f4599261cfc31cdbf9c371fa4de0d87f17fd862f..6d4a18fc2fcd4bb487050dfe3d77e0659e342792 100644 (file)
@@ -847,6 +847,7 @@ static int sysfs_add_battery(struct acpi_battery *battery)
        struct power_supply_config psy_cfg = {
                .drv_data = battery,
                .attr_grp = acpi_battery_groups,
+               .no_wakeup_source = true,
        };
        bool full_cap_broken = false;
 
@@ -882,7 +883,7 @@ static int sysfs_add_battery(struct acpi_battery *battery)
        battery->bat_desc.type = POWER_SUPPLY_TYPE_BATTERY;
        battery->bat_desc.get_property = acpi_battery_get_property;
 
-       battery->bat = power_supply_register_no_ws(&battery->device->dev,
+       battery->bat = power_supply_register(&battery->device->dev,
                                &battery->bat_desc, &psy_cfg);
 
        if (IS_ERR(battery->bat)) {