Skip to content

Commit d453e55

Browse files
committed
power: supply: ln8411: Refactor power_supply_set_input_current_limit_from_supplier
Eliminates the deprecated power_supply_set_input_current_limit_from_supplier() handler and replaces it with power_supply_get_property_from_supplier() Change-Id: I3d190433da04140707572f638e4cea07a78ca1ef Link: https://lkml.org/lkml/2022/2/1/403 Signed-off-by: Ricardo Rivera-Matos <[email protected]>
1 parent c0792c9 commit d453e55

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

drivers/power/supply/ln8411_charger.c

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,12 +1454,24 @@ static int ln8411_get_usb_property(struct power_supply *psy,
14541454
return 0;
14551455
}
14561456

1457+
static int ln8411_set_input_current_limit_from_supplier(struct power_supply *psy)
1458+
{
1459+
union power_supply_propval val;
1460+
int ret;
1461+
1462+
ret = power_supply_get_property_from_supplier(psy, POWER_SUPPLY_PROP_CURRENT_MAX, &val);
1463+
if (ret)
1464+
return ret;
1465+
1466+
return power_supply_set_property(psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &val);
1467+
}
1468+
14571469
static void ln8411_usb_external_power_changed(struct power_supply *psy)
14581470
{
14591471
struct ln8411_device *ln8411 = power_supply_get_drvdata(psy);
14601472
int ret;
14611473

1462-
ret = power_supply_set_input_current_limit_from_supplier(ln8411->vusb);
1474+
ret = ln8411_set_input_current_limit_from_supplier(ln8411->vusb);
14631475
if (ret)
14641476
dev_dbg(ln8411->dev, "Failed to set USB current limit from supplier: %d!\n", ret);
14651477
}
@@ -1469,7 +1481,7 @@ static void ln8411_wpc_external_power_changed(struct power_supply *psy)
14691481
struct ln8411_device *ln8411 = power_supply_get_drvdata(psy);
14701482
int ret;
14711483

1472-
ret = power_supply_set_input_current_limit_from_supplier(ln8411->vwpc);
1484+
ret = ln8411_set_input_current_limit_from_supplier(ln8411->vwpc);
14731485
if (ret)
14741486
dev_dbg(ln8411->dev, "Failed to set WPC current limit from supplier: %d!\n", ret);
14751487
}
@@ -1653,7 +1665,7 @@ static void ln8411_charger_external_power_changed(struct power_supply *psy)
16531665
struct ln8411_device *ln8411 = power_supply_get_drvdata(psy);
16541666
int ret;
16551667

1656-
ret = power_supply_set_input_current_limit_from_supplier(ln8411->charger);
1668+
ret = ln8411_set_input_current_limit_from_supplier(ln8411->charger);
16571669
if (ret)
16581670
dev_dbg(ln8411->dev, "Failed to set bus current limit from supplier: %d!\n", ret);
16591671
}

0 commit comments

Comments
 (0)