Skip to content

Commit 7058333

Browse files
t-8chsre
authored andcommitted
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 <[email protected]> Reviewed-by: Tzung-Bi Shih <[email protected]> Link: https://lore.kernel.org/r/20241005-power-supply-no-wakeup-source-v1-6-1d62bf9bcb1d@weissschuh.net Signed-off-by: Sebastian Reichel <[email protected]>
1 parent e8d2dfa commit 7058333

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

drivers/power/supply/lenovo_yoga_c630_battery.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -368,11 +368,12 @@ static int yoga_c630_psy_register_bat_psy(struct yoga_c630_psy *ecbat)
368368

369369
bat_cfg.drv_data = ecbat;
370370
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);
376377
if (IS_ERR(ecbat->bat_psy)) {
377378
dev_err(ecbat->dev, "failed to register battery supply\n");
378379
return PTR_ERR(ecbat->bat_psy);
@@ -442,7 +443,8 @@ static int yoga_c630_psy_probe(struct auxiliary_device *adev,
442443
adp_cfg.fwnode = ecbat->fwnode;
443444
adp_cfg.supplied_to = (char **)&yoga_c630_psy_bat_psy_desc_mA.name;
444445
adp_cfg.num_supplicants = 1;
445-
ecbat->adp_psy = devm_power_supply_register_no_ws(dev, &yoga_c630_psy_adpt_psy_desc, &adp_cfg);
446+
adp_cfg.no_wakeup_source = true;
447+
ecbat->adp_psy = devm_power_supply_register(dev, &yoga_c630_psy_adpt_psy_desc, &adp_cfg);
446448
if (IS_ERR(ecbat->adp_psy)) {
447449
dev_err(dev, "failed to register AC adapter supply\n");
448450
return PTR_ERR(ecbat->adp_psy);

0 commit comments

Comments
 (0)