power: supply: core: remove {,devm_}power_supply_register_no_ws()

[PATCH 2/8] ACPI: battery: Register power supply with power_supply_register()

Posted by Thomas Weißschuh 1 year, 2 months ago

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>
---
 drivers/acpi/battery.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
index 65fa3444367a13ac83644444076a11f08152c382..9a3a475f8ad334bb365e6a0273084034b8baa3bd 100644
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
@@ -853,6 +853,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;
 
@@ -888,7 +889,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)) {

-- 
2.46.2

Re: [PATCH 2/8] ACPI: battery: Register power supply with power_supply_register()

Posted by Tzung-Bi Shih 1 year, 2 months ago

On Sat, Oct 05, 2024 at 12:05:04PM +0200, Thomas Weißschuh wrote:
> 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>

Re: [PATCH 2/8] ACPI: battery: Register power supply with power_supply_register()

Posted by Rafael J. Wysocki 1 year, 2 months ago

On Sat, Oct 5, 2024 at 12:05 PM Thomas Weißschuh <linux@weissschuh.net> wrote:
>
> 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>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@inte;.com>

and I'm assuming this to be handled along with the rest of the series.

> ---
>  drivers/acpi/battery.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index 65fa3444367a13ac83644444076a11f08152c382..9a3a475f8ad334bb365e6a0273084034b8baa3bd 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -853,6 +853,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;
>
> @@ -888,7 +889,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)) {
>
> --
> 2.46.2
>

Re: [PATCH 2/8] ACPI: battery: Register power supply with power_supply_register()

Posted by Thomas Weißschuh 1 year, 2 months ago

On 2024-10-07 18:51:45+0200, Rafael J. Wysocki wrote:
> On Sat, Oct 5, 2024 at 12:05 PM Thomas Weißschuh <linux@weissschuh.net> wrote:
> >
> > 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>
> 
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@inte;.com>

Thanks!

> and I'm assuming this to be handled along with the rest of the series.

Yes, this should go through the power supply tree.