Skip to content

Commit f57f583

Browse files
kcxtsre
authored andcommitted
power: supply: qcom_pmi8998_charger: remove CHARGE_CONTROL_LIMIT_* props
These property were intended to allow the power supply to be treated as a cooling device, however the cooling device interface has been dropped from the psy core code. They now just duplicate the CURRENT_NOW and CURRENT_MAX properties and are generally confusing, drop them. Signed-off-by: Caleb Connolly <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Sebastian Reichel <[email protected]>
1 parent 13a0d10 commit f57f583

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

drivers/power/supply/qcom_pmi8998_charger.c

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -409,8 +409,6 @@ static enum power_supply_property smb2_properties[] = {
409409
POWER_SUPPLY_PROP_HEALTH,
410410
POWER_SUPPLY_PROP_ONLINE,
411411
POWER_SUPPLY_PROP_USB_TYPE,
412-
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT,
413-
POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX,
414412
};
415413

416414
static enum power_supply_usb_type smb2_usb_types[] = {
@@ -674,11 +672,7 @@ static int smb2_get_property(struct power_supply *psy,
674672
val->strval = chip->name;
675673
return 0;
676674
case POWER_SUPPLY_PROP_CURRENT_MAX:
677-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
678675
return smb2_get_current_limit(chip, &val->intval);
679-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT_MAX:
680-
val->intval = DCP_CURRENT_UA;
681-
return 0;
682676
case POWER_SUPPLY_PROP_CURRENT_NOW:
683677
return smb2_get_iio_chan(chip, chip->usb_in_i_chan,
684678
&val->intval);
@@ -707,7 +701,6 @@ static int smb2_set_property(struct power_supply *psy,
707701

708702
switch (psp) {
709703
case POWER_SUPPLY_PROP_CURRENT_MAX:
710-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
711704
return smb2_set_current_limit(chip, val->intval);
712705
default:
713706
dev_err(chip->dev, "No setter for property: %d\n", psp);
@@ -720,7 +713,6 @@ static int smb2_property_is_writable(struct power_supply *psy,
720713
{
721714
switch (psp) {
722715
case POWER_SUPPLY_PROP_CURRENT_MAX:
723-
case POWER_SUPPLY_PROP_CHARGE_CONTROL_LIMIT:
724716
return 1;
725717
default:
726718
return 0;

0 commit comments

Comments
 (0)