From: Thomas Weißschuh Date: Sat, 5 Oct 2024 10:05:04 +0000 (+0200) Subject: ACPI: battery: Register power supply with power_supply_register() X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2de244e91ddf5cfcf7d88275ad2dbe7f0367e57e;p=users%2Fdwmw2%2Flinux.git ACPI: battery: Register power supply with power_supply_register() power_supply_register_no_ws() is going to be removed. Switch to the general registration API. Signed-off-by: Thomas Weißschuh Reviewed-by: Tzung-Bi Shih Link: https://lore.kernel.org/r/20241005-power-supply-no-wakeup-source-v1-2-1d62bf9bcb1d@weissschuh.net Signed-off-by: Sebastian Reichel --- diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index f4599261cfc31..6d4a18fc2fcd4 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c @@ -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)) {