Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

power: supply: lenovo_yoga_c630_battery: register power supplies with power_supply_register()

{,devm_}power_supply_register_no_ws() are 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-6-1d62bf9bcb1d@weissschuh.net
Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

authored by

Thomas Weißschuh and committed by
Sebastian Reichel
70583330 e8d2dfa6

+8 -6
+8 -6
drivers/power/supply/lenovo_yoga_c630_battery.c
··· 368 368 369 369 bat_cfg.drv_data = ecbat; 370 370 bat_cfg.fwnode = ecbat->fwnode; 371 - ecbat->bat_psy = power_supply_register_no_ws(ecbat->dev, 372 - ecbat->unit_mA ? 373 - &yoga_c630_psy_bat_psy_desc_mA : 374 - &yoga_c630_psy_bat_psy_desc_mWh, 375 - &bat_cfg); 371 + bat_cfg.no_wakeup_source = true; 372 + ecbat->bat_psy = power_supply_register(ecbat->dev, 373 + ecbat->unit_mA ? 374 + &yoga_c630_psy_bat_psy_desc_mA : 375 + &yoga_c630_psy_bat_psy_desc_mWh, 376 + &bat_cfg); 376 377 if (IS_ERR(ecbat->bat_psy)) { 377 378 dev_err(ecbat->dev, "failed to register battery supply\n"); 378 379 return PTR_ERR(ecbat->bat_psy); ··· 443 442 adp_cfg.fwnode = ecbat->fwnode; 444 443 adp_cfg.supplied_to = (char **)&yoga_c630_psy_bat_psy_desc_mA.name; 445 444 adp_cfg.num_supplicants = 1; 446 - ecbat->adp_psy = devm_power_supply_register_no_ws(dev, &yoga_c630_psy_adpt_psy_desc, &adp_cfg); 445 + adp_cfg.no_wakeup_source = true; 446 + ecbat->adp_psy = devm_power_supply_register(dev, &yoga_c630_psy_adpt_psy_desc, &adp_cfg); 447 447 if (IS_ERR(ecbat->adp_psy)) { 448 448 dev_err(dev, "failed to register AC adapter supply\n"); 449 449 return PTR_ERR(ecbat->adp_psy);