charger: rename charger_set_input_current

charger_set_input_current was actually sets the input current limit,
so renames it to charger_set_input_current_limit.

BUG=b:171853295
TEST=make buildall
TEST=not output from `grep -r "\<charger_set_input_current\>"`
BRANCH=none

Change-Id: Icf4e99f287a7d4fc2d9560e8502e46cc07bfc085
Signed-off-by: Eric Yilun Lin <yllin@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2569083
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>

9 files changed, 59 insertions, 56 deletions

diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c
index 950657f457..b38776a574 100644
--- a/driver/charger/bd9995x.c
+++ b/driver/charger/bd9995x.c
@@ -614,8 +614,8 @@ static int bd9995x_ramp_max(int supplier, int sup_curr)
 
 /* chip specific interfaces */
 
-static enum ec_error_list bd9995x_set_input_current(int chgnum,
-						    int input_current)
+static enum ec_error_list bd9995x_set_input_current_limit(int chgnum,
+							  int input_current)
 {
 	int rv;
 
@@ -902,7 +902,7 @@ static void bd9995x_battery_charging_profile_settings(int chgnum)
 	const struct battery_info *bi = battery_get_info();
 
 	/* Input Current Limit Setting */
-	bd9995x_set_input_current(chgnum, CONFIG_CHARGER_INPUT_CURRENT);
+	bd9995x_set_input_current_limit(chgnum, CONFIG_CHARGER_INPUT_CURRENT);
 
 	/* Charge Termination Current Setting */
 	ch_raw_write16(chgnum, BD9995X_CMD_ITERM_SET, 0,
@@ -1731,7 +1731,7 @@ const struct charger_drv bd9995x_drv = {
 	.set_voltage = &bd9995x_set_voltage,
 	.discharge_on_ac = &bd9995x_discharge_on_ac,
 	.get_vbus_voltage = &bd9995x_get_vbus_voltage,
-	.set_input_current = &bd9995x_set_input_current,
+	.set_input_current_limit = &bd9995x_set_input_current_limit,
 	.get_input_current = &bd9995x_get_input_current,
 	.manufacturer_id = &bd9995x_manufacturer_id,
 	.device_id = &bd9995x_device_id,
diff --git a/driver/charger/bq24715.c b/driver/charger/bq24715.c
index 691d5f94fb..8c83575c65 100644
--- a/driver/charger/bq24715.c
+++ b/driver/charger/bq24715.c
@@ -49,8 +49,8 @@ static inline enum ec_error_list sbc_write(int chgnum, int cmd, int param)
 			   cmd, param);
 }
 
-static enum ec_error_list bq24715_set_input_current(int chgnum,
-						    int input_current)
+static enum ec_error_list bq24715_set_input_current_limit(int chgnum,
+							  int input_current)
 {
 	return sbc_write(chgnum, BQ24715_INPUT_CURRENT,
 			 CURRENT_TO_REG(input_current, R_AC));
@@ -209,7 +209,8 @@ static enum ec_error_list bq24715_post_init(int chgnum)
 	if (rv)
 		return rv;
 
-	rv = bq24715_set_input_current(chgnum, CONFIG_CHARGER_INPUT_CURRENT);
+	rv = bq24715_set_input_current_limit(chgnum,
+					     CONFIG_CHARGER_INPUT_CURRENT);
 	return rv;
 }
 
@@ -242,7 +243,7 @@ const struct charger_drv bq24715_drv = {
 	.get_voltage = &bq24715_get_voltage,
 	.set_voltage = &bq24715_set_voltage,
 	.discharge_on_ac = &bq24715_discharge_on_ac,
-	.set_input_current = &bq24715_set_input_current,
+	.set_input_current_limit = &bq24715_set_input_current_limit,
 	.get_input_current = &bq24715_get_input_current,
 	.manufacturer_id = &bq24715_manufacturer_id,
 	.device_id = &bq24715_device_id,
diff --git a/driver/charger/bq24773.c b/driver/charger/bq24773.c
index bfaac4873a..b18c678b3a 100644
--- a/driver/charger/bq24773.c
+++ b/driver/charger/bq24773.c
@@ -91,8 +91,8 @@ static inline enum ec_error_list raw_write16(int chgnum, int offset, int value)
 
 /* chip specific interfaces */
 
-static enum ec_error_list bq2477x_set_input_current(int chgnum,
-						    int input_current)
+static enum ec_error_list bq2477x_set_input_current_limit(int chgnum,
+							  int input_current)
 {
 #ifdef CONFIG_CHARGER_BQ24770
 	return raw_write16(chgnum, REG_INPUT_CURRENT,
@@ -308,7 +308,7 @@ const struct charger_drv bq2477x_drv = {
 	.get_voltage = &bq2477x_get_voltage,
 	.set_voltage = &bq2477x_set_voltage,
 	.discharge_on_ac = &bq2477x_discharge_on_ac,
-	.set_input_current = &bq2477x_set_input_current,
+	.set_input_current_limit = &bq2477x_set_input_current_limit,
 	.get_input_current = &bq2477x_get_input_current,
 	.manufacturer_id = &bq2477x_manufacturer_id,
 	.device_id = &bq2477x_device_id,
diff --git a/driver/charger/bq25710.c b/driver/charger/bq25710.c
index d8a406b73c..fdfacbaa35 100644
--- a/driver/charger/bq25710.c
+++ b/driver/charger/bq25710.c
@@ -388,8 +388,8 @@ static enum ec_error_list bq25710_discharge_on_ac(int chgnum, int enable)
 	return bq25710_set_option(chgnum, option);
 }
 
-static enum ec_error_list bq25710_set_input_current(int chgnum,
-						    int input_current)
+static enum ec_error_list bq25710_set_input_current_limit(int chgnum,
+							  int input_current)
 {
 	int num_steps = INPUT_CURRENT_TO_REG(input_current);
 
@@ -485,7 +485,8 @@ static void bq25710_chg_ramp_handle(void)
 	 */
 	ramp_curr = chg_ramp_get_current_limit();
 	if (chg_ramp_is_stable()) {
-		if (ramp_curr && !charger_set_input_current(chgnum, ramp_curr))
+		if (ramp_curr &&
+		    !charger_set_input_current_limit(chgnum, ramp_curr))
 			CPRINTF("bq25710: stable ramp current=%d\n", ramp_curr);
 	} else {
 		CPRINTF("bq25710: ICO stall, ramp current=%d\n", ramp_curr);
@@ -668,7 +669,7 @@ const struct charger_drv bq25710_drv = {
 	.set_voltage = &bq25710_set_voltage,
 	.discharge_on_ac = &bq25710_discharge_on_ac,
 	.get_vbus_voltage = &bq25710_get_vbus_voltage,
-	.set_input_current = &bq25710_set_input_current,
+	.set_input_current_limit = &bq25710_set_input_current_limit,
 	.get_input_current = &bq25710_get_input_current,
 	.manufacturer_id = &bq25710_manufacturer_id,
 	.device_id = &bq25710_device_id,
diff --git a/driver/charger/isl923x.c b/driver/charger/isl923x.c
index e0d7f4feea..3d70ba6431 100644
--- a/driver/charger/isl923x.c
+++ b/driver/charger/isl923x.c
@@ -154,17 +154,17 @@ static enum ec_error_list isl9237_set_voltage(int chgnum, uint16_t voltage)
 
 /* chip specific interfaces */
 
-static enum ec_error_list isl923x_set_input_current(int chgnum,
-						    int input_current)
+static enum ec_error_list isl923x_set_input_current_limit(int chgnum,
+							  int input_current)
 {
 	int rv;
 	uint16_t reg = AC_CURRENT_TO_REG(input_current);
 
-	rv = raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT1, reg);
+	rv = raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT_LIMIT1, reg);
 	if (rv)
 		return rv;
 
-	return raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT2, reg);
+	return raw_write16(chgnum, ISL923X_REG_ADAPTER_CURRENT_LIMIT2, reg);
 }
 
 #ifdef CONFIG_CMD_CHARGER_ADC_AMON_BMON
@@ -224,7 +224,7 @@ static enum ec_error_list isl923x_get_input_current(int chgnum,
 	if (IS_ENABLED(CONFIG_CHARGER_RAA489000))
 		reg = RAA489000_REG_ADC_INPUT_CURRENT;
 	else
-		reg = ISL923X_REG_ADAPTER_CURRENT1;
+		reg = ISL923X_REG_ADAPTER_CURRENT_LIMIT1;
 
 	rv = raw_read16(chgnum, reg, &regval);
 	if (rv)
@@ -686,8 +686,8 @@ static void isl923x_init(int chgnum)
 		/*
 		 * Initialize the input current limit to the board's default.
 		 */
-		if (isl923x_set_input_current(chgnum,
-					      CONFIG_CHARGER_INPUT_CURRENT))
+		if (isl923x_set_input_current_limit(
+				chgnum, CONFIG_CHARGER_INPUT_CURRENT))
 			goto init_fail;
 	}
 
@@ -1281,7 +1281,7 @@ const struct charger_drv isl923x_drv = {
 	.set_voltage = &isl923x_set_voltage,
 	.discharge_on_ac = &isl923x_discharge_on_ac,
 	.get_vbus_voltage = &isl923x_get_vbus_voltage,
-	.set_input_current = &isl923x_set_input_current,
+	.set_input_current_limit = &isl923x_set_input_current_limit,
 	.get_input_current = &isl923x_get_input_current,
 	.manufacturer_id = &isl923x_manufacturer_id,
 	.device_id = &isl923x_device_id,
diff --git a/driver/charger/isl923x.h b/driver/charger/isl923x.h
index 8194cdfb7d..0ae8327ed4 100644
--- a/driver/charger/isl923x.h
+++ b/driver/charger/isl923x.h
@@ -12,29 +12,29 @@
 #define ISL923X_ADDR_FLAGS	(0x09)
 
 /* Registers */
-#define ISL923X_REG_CHG_CURRENT      0x14
-#define ISL923X_REG_ADAPTER_CURRENT1 0x3f
-#define ISL923X_REG_ADAPTER_CURRENT2 0x3b
-#define ISL923X_REG_SYS_VOLTAGE_MAX  0x15
-#define ISL923X_REG_SYS_VOLTAGE_MIN  0x3e
-#define ISL923X_REG_PROCHOT_AC       0x47
-#define ISL923X_REG_PROCHOT_DC       0x48
-#define ISL923X_REG_T1_T2            0x38
-#define ISL923X_REG_CONTROL0         0x39
-#define ISL923X_REG_CONTROL1         0x3c
-#define ISL923X_REG_CONTROL2         0x3d
-#define ISL9238_REG_CONTROL3         0x4c
-#define ISL9238_REG_CONTROL4         0x4e
-#define ISL9238C_REG_CONTROL6        0x37
-#define ISL923X_REG_INFO             0x3a
-#define ISL9238_REG_INFO2            0x4d
-#define ISL923X_REG_OTG_VOLTAGE      0x49
-#define ISL923X_REG_OTG_CURRENT      0x4a
-#define ISL9238_REG_INPUT_VOLTAGE    0x4b
-#define ISL923X_REG_MANUFACTURER_ID  0xfe
-#define ISL923X_REG_DEVICE_ID        0xff
-#define RAA489000_REG_CONTROL8       0x37
-#define RAA489000_REG_CONTROL10      0x35
+#define ISL923X_REG_CHG_CURRENT            0x14
+#define ISL923X_REG_ADAPTER_CURRENT_LIMIT1 0x3f
+#define ISL923X_REG_ADAPTER_CURRENT_LIMIT2 0x3b
+#define ISL923X_REG_SYS_VOLTAGE_MAX        0x15
+#define ISL923X_REG_SYS_VOLTAGE_MIN        0x3e
+#define ISL923X_REG_PROCHOT_AC             0x47
+#define ISL923X_REG_PROCHOT_DC             0x48
+#define ISL923X_REG_T1_T2                  0x38
+#define ISL923X_REG_CONTROL0               0x39
+#define ISL923X_REG_CONTROL1               0x3c
+#define ISL923X_REG_CONTROL2               0x3d
+#define ISL9238_REG_CONTROL3               0x4c
+#define ISL9238_REG_CONTROL4               0x4e
+#define ISL9238C_REG_CONTROL6              0x37
+#define ISL923X_REG_INFO                   0x3a
+#define ISL9238_REG_INFO2                  0x4d
+#define ISL923X_REG_OTG_VOLTAGE            0x49
+#define ISL923X_REG_OTG_CURRENT            0x4a
+#define ISL9238_REG_INPUT_VOLTAGE          0x4b
+#define ISL923X_REG_MANUFACTURER_ID        0xfe
+#define ISL923X_REG_DEVICE_ID              0xff
+#define RAA489000_REG_CONTROL8             0x37
+#define RAA489000_REG_CONTROL10            0x35
 
 /* Sense resistor default values in mOhm */
 #define ISL923X_DEFAULT_SENSE_RESISTOR_AC 20
diff --git a/driver/charger/isl9241.c b/driver/charger/isl9241.c
index 4fd92e6c08..57b9f918e1 100644
--- a/driver/charger/isl9241.c
+++ b/driver/charger/isl9241.c
@@ -89,8 +89,8 @@ static inline enum ec_error_list isl9241_update(int chgnum, int offset,
 
 /*****************************************************************************/
 /* Charger interfaces */
-static enum ec_error_list isl9241_set_input_current(int chgnum,
-						    int input_current)
+static enum ec_error_list isl9241_set_input_current_limit(int chgnum,
+							  int input_current)
 {
 	int rv;
 	uint16_t reg = AC_CURRENT_TO_REG(input_current);
@@ -432,7 +432,8 @@ static void isl9241_init(int chgnum)
 		return;
 
 	/* Initialize the input current limit to the board's default. */
-	if (isl9241_set_input_current(chgnum, CONFIG_CHARGER_INPUT_CURRENT))
+	if (isl9241_set_input_current_limit(chgnum,
+					    CONFIG_CHARGER_INPUT_CURRENT))
 		goto init_fail;
 
 	return;
@@ -537,7 +538,7 @@ const struct charger_drv isl9241_drv = {
 	.set_voltage = &isl9241_set_voltage,
 	.discharge_on_ac = &isl9241_discharge_on_ac,
 	.get_vbus_voltage = &isl9241_get_vbus_voltage,
-	.set_input_current = &isl9241_set_input_current,
+	.set_input_current_limit = &isl9241_set_input_current_limit,
 	.get_input_current = &isl9241_get_input_current,
 	.manufacturer_id = &isl9241_manufacturer_id,
 	.device_id = &isl9241_device_id,
diff --git a/driver/charger/rt946x.c b/driver/charger/rt946x.c
index 8586f989a0..e63a0f2338 100644
--- a/driver/charger/rt946x.c
+++ b/driver/charger/rt946x.c
@@ -696,8 +696,8 @@ static int rt946x_is_sourcing_otg_power(int chgnum, int port)
 }
 #endif
 
-static enum ec_error_list rt946x_set_input_current(int chgnum,
-						   int input_current)
+static enum ec_error_list rt946x_set_input_current_limit(int chgnum,
+							 int input_current)
 {
 	uint8_t reg_iin = 0;
 	const struct charger_info * const info = rt946x_get_info(chgnum);
@@ -1895,7 +1895,7 @@ const struct charger_drv rt946x_drv = {
 	.set_voltage = &rt946x_set_voltage,
 	.discharge_on_ac = &rt946x_discharge_on_ac,
 	.get_vbus_voltage = &rt946x_get_vbus_voltage,
-	.set_input_current = &rt946x_set_input_current,
+	.set_input_current_limit = &rt946x_set_input_current_limit,
 	.get_input_current = &rt946x_get_input_current,
 	.manufacturer_id = &rt946x_manufacturer_id,
 	.device_id = &rt946x_device_id,
diff --git a/driver/charger/sm5803.c b/driver/charger/sm5803.c
index e4da424e1e..c5415eb260 100644
--- a/driver/charger/sm5803.c
+++ b/driver/charger/sm5803.c
@@ -1267,8 +1267,8 @@ static enum ec_error_list sm5803_get_vbus_voltage(int chgnum, int port,
 	return rv;
 }
 
-static enum ec_error_list sm5803_set_input_current(int chgnum,
-						   int input_current)
+static enum ec_error_list sm5803_set_input_current_limit(int chgnum,
+							 int input_current)
 {
 	int reg;
 
@@ -1600,7 +1600,7 @@ const struct charger_drv sm5803_drv = {
 	.set_voltage = &sm5803_set_voltage,
 	.discharge_on_ac = &sm5803_discharge_on_ac,
 	.get_vbus_voltage = &sm5803_get_vbus_voltage,
-	.set_input_current = &sm5803_set_input_current,
+	.set_input_current_limit = &sm5803_set_input_current_limit,
 	.get_input_current = &sm5803_get_input_current,
 	.device_id = &sm5803_get_dev_id,
 	.get_option = &sm5803_get_option,