diff options
| author | Diana Z <dzigterman@chromium.org> | 2020-01-22 12:07:04 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-01-28 20:22:26 +0000 |
| commit | 1b4ce5849d520b67447bdc5b94e346432eac2126 (patch) | |
| tree | a640609b5c024c0020ccb48e121b496fa686f1c2 /driver/charger/bd9995x.c | |
| parent | f1e626bf81bc511d713fd306395d00e857764c09 (diff) | |
| download | chrome-ec-1b4ce5849d520b67447bdc5b94e346432eac2126.tar.gz | |
Charger: change get_vbus_voltage to return EC error
The other driver structure members return an ec_error_list value and
fill in parameters to return data. This commit changes the
get_vbus_voltage call to follow that model.
BRANCH=None
BUG=b:147672225
TEST=builds
Change-Id: I7308502a9734274dd308b830762493c4d70d147a
Signed-off-by: Diana Z <dzigterman@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2015340
Reviewed-by: Jett Rink <jettrink@chromium.org>
Diffstat (limited to 'driver/charger/bd9995x.c')
| -rw-r--r-- | driver/charger/bd9995x.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/driver/charger/bd9995x.c b/driver/charger/bd9995x.c index 9c78ba7709..d2d3c96751 100644 --- a/driver/charger/bd9995x.c +++ b/driver/charger/bd9995x.c @@ -1063,16 +1063,16 @@ static enum ec_error_list bd9995x_discharge_on_ac(int chgnum, int enable) BD9995X_EXTENDED_COMMAND); } -static int bd9995x_get_vbus_voltage(int chgnum, int port) +static enum ec_error_list bd9995x_get_vbus_voltage(int chgnum, int port, + int *voltage) { uint8_t read_reg; - int voltage; read_reg = (port == BD9995X_CHARGE_PORT_VBUS) ? BD9995X_CMD_VBUS_VAL : BD9995X_CMD_VCC_VAL; - return ch_raw_read16(chgnum, read_reg, &voltage, - BD9995X_EXTENDED_COMMAND) ? 0 : voltage; + return ch_raw_read16(chgnum, read_reg, voltage, + BD9995X_EXTENDED_COMMAND); } /*** Non-standard interface functions ***/ |