summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2023-04-28 16:42:30 -0700
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2023-05-02 18:34:05 +0000
commit65392a5080a08f3273017fc03d3d0940492d2092 (patch)
treea17af823cd394e1cf844979f6c33def52758acd9 /common
parentfaa0c7623c23544cc5cac4928394b9099e10d2e0 (diff)
downloadchrome-ec-65392a5080a08f3273017fc03d3d0940492d2092.tar.gz
charge_manager: Rename ambiguously scoped override_port
There is override_port defined in the file scope. hc_charge_port_override uses a local variable of the same name. This CL fixes the ambiguity. There is no functionality change. BUG=b:278898714 BRANCH=None TEST=Run 'echo 1 > /sys/.../CROS_USBPD_CHARGER0/charge_control_limit_max' to verify override port is switched to port 0. Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Change-Id: I72b524a2775352dd866af81534175c1be7cafff0 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4493227 Reviewed-by: Ting Shen <phoenixshen@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/charge_manager.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/common/charge_manager.c b/common/charge_manager.c
index 198c1ef301..2c79047efa 100644
--- a/common/charge_manager.c
+++ b/common/charge_manager.c
@@ -1528,15 +1528,13 @@ static enum ec_status
hc_charge_port_override(struct host_cmd_handler_args *args)
{
const struct ec_params_charge_port_override *p = args->params;
- const int16_t override_port = p->override_port;
+ const int16_t op = p->override_port;
- if (override_port < OVERRIDE_DONT_CHARGE ||
- override_port >= CHARGE_PORT_COUNT)
+ if (op < OVERRIDE_DONT_CHARGE || op >= CHARGE_PORT_COUNT)
return EC_RES_INVALID_PARAM;
- return charge_manager_set_override(override_port) == EC_SUCCESS ?
- EC_RES_SUCCESS :
- EC_RES_ERROR;
+ return charge_manager_set_override(op) == EC_SUCCESS ? EC_RES_SUCCESS :
+ EC_RES_ERROR;
}
DECLARE_HOST_COMMAND(EC_CMD_PD_CHARGE_PORT_OVERRIDE, hc_charge_port_override,
EC_VER_MASK(0));