]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
power: supply: cros_usbpd-charger: register power supply with devm_power_supply_regis...
authorThomas Weißschuh <linux@weissschuh.net>
Sat, 5 Oct 2024 10:05:07 +0000 (12:05 +0200)
committerSebastian Reichel <sebastian.reichel@collabora.com>
Tue, 15 Oct 2024 20:22:21 +0000 (22:22 +0200)
devm_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: Tzung-Bi Shih <tzungbi@kernel.org>
Link: https://lore.kernel.org/r/20241005-power-supply-no-wakeup-source-v1-5-1d62bf9bcb1d@weissschuh.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
drivers/power/supply/cros_usbpd-charger.c

index bed3e2e9bfea971142f10956ed499b1ac2d834dd..47d3f58aa15ceb792b3c3dc2468e770890d76b7e 100644 (file)
@@ -618,6 +618,7 @@ static int cros_usbpd_charger_probe(struct platform_device *pd)
                psy_desc->external_power_changed =
                                        cros_usbpd_charger_power_changed;
                psy_cfg.drv_data = port;
+               psy_cfg.no_wakeup_source = true;
 
                if (cros_usbpd_charger_port_is_dedicated(port)) {
                        sprintf(port->name, CHARGER_DEDICATED_DIR_NAME);
@@ -644,8 +645,7 @@ static int cros_usbpd_charger_probe(struct platform_device *pd)
 
                psy_desc->name = port->name;
 
-               psy = devm_power_supply_register_no_ws(dev, psy_desc,
-                                                      &psy_cfg);
+               psy = devm_power_supply_register(dev, psy_desc, &psy_cfg);
                if (IS_ERR(psy)) {
                        dev_err(dev, "Failed to register power supply\n");
                        continue;