diff options
author | Tom Hughes <tomhughes@chromium.org> | 2019-09-20 10:04:44 -0700 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-10-02 10:19:57 +0000 |
commit | 83d793839479a6f3414dbf51c00536aff65618f3 (patch) | |
tree | 41047552e73878fad5ddbc4126d59a52643b041f /driver | |
parent | 4e692f29e3e5af6b85df472e4c4f936c6f461cb9 (diff) | |
download | chrome-ec-83d793839479a6f3414dbf51c00536aff65618f3.tar.gz |
host_command: Change host command return value to enum ec_status
If the host command handler callback function returns an int, it's easy
to accidentally mix up the enum ec_error_list and enum ec_status types.
The host commands always expect an enum ec_status type, so we change the
return value to be of that explicit type. Compilation will then fail if
you accidentally try to return an enum ec_error_list value.
Ran the following commands and then manually fixed up a few remaining
instances that were not caught:
git grep --name-only 'static int .*(struct host_cmd_handler_args \*args)' |\
xargs sed -i 's#static int \(.*\)(struct host_cmd_handler_args \*args)#\
static enum ec_status \1(struct host_cmd_handler_args \*args)##'
git grep --name-only 'int .*(struct host_cmd_handler_args \*args)' |\
xargs sed -i 's#int \(.*\)(struct host_cmd_handler_args \*args)#\
enum ec_status \1(struct host_cmd_handler_args \*args)##'
BRANCH=none
BUG=chromium:1004831
TEST=make buildall -j
Cq-Depend: chrome-internal:1872675
Change-Id: Id93df9387ac53d016a1594dba86c6642babbfd1e
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1816865
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'driver')
-rw-r--r-- | driver/battery/bq20z453.c | 2 | ||||
-rw-r--r-- | driver/battery/smart.c | 12 | ||||
-rw-r--r-- | driver/temp_sensor/tmp006.c | 6 | ||||
-rw-r--r-- | driver/usb_mux/usb_mux.c | 2 |
4 files changed, 13 insertions, 9 deletions
diff --git a/driver/battery/bq20z453.c b/driver/battery/bq20z453.c index 1dab5d76e5..3cd16e8b8f 100644 --- a/driver/battery/bq20z453.c +++ b/driver/battery/bq20z453.c @@ -18,7 +18,7 @@ static void cutoff(void) } DECLARE_DEFERRED(cutoff); -int battery_command_cut_off(struct host_cmd_handler_args *args) +enum ec_status battery_command_cut_off(struct host_cmd_handler_args *args) { /* * Queue battery cutoff. This must be deferred so we can send the diff --git a/driver/battery/smart.c b/driver/battery/smart.c index 50a29cfeff..89a99623af 100644 --- a/driver/battery/smart.c +++ b/driver/battery/smart.c @@ -498,7 +498,8 @@ DECLARE_CONSOLE_COMMAND(battmfgacc, command_batt_mfg_access_read, /* Smart battery pass-through */ #ifdef CONFIG_I2C_PASSTHROUGH -static int host_command_sb_read_word(struct host_cmd_handler_args *args) +static enum ec_status +host_command_sb_read_word(struct host_cmd_handler_args *args) { int rv; int val; @@ -520,7 +521,8 @@ DECLARE_HOST_COMMAND(EC_CMD_SB_READ_WORD, host_command_sb_read_word, EC_VER_MASK(0)); -static int host_command_sb_write_word(struct host_cmd_handler_args *args) +static enum ec_status +host_command_sb_write_word(struct host_cmd_handler_args *args) { int rv; const struct ec_params_sb_wr_word *p = args->params; @@ -537,7 +539,8 @@ DECLARE_HOST_COMMAND(EC_CMD_SB_WRITE_WORD, host_command_sb_write_word, EC_VER_MASK(0)); -static int host_command_sb_read_block(struct host_cmd_handler_args *args) +static enum ec_status +host_command_sb_read_block(struct host_cmd_handler_args *args) { int rv; const struct ec_params_sb_rd *p = args->params; @@ -560,7 +563,8 @@ DECLARE_HOST_COMMAND(EC_CMD_SB_READ_BLOCK, host_command_sb_read_block, EC_VER_MASK(0)); -static int host_command_sb_write_block(struct host_cmd_handler_args *args) +static enum ec_status +host_command_sb_write_block(struct host_cmd_handler_args *args) { /* Not implemented */ return EC_RES_INVALID_COMMAND; diff --git a/driver/temp_sensor/tmp006.c b/driver/temp_sensor/tmp006.c index 1b8f6eb746..e4794ccc4a 100644 --- a/driver/temp_sensor/tmp006.c +++ b/driver/temp_sensor/tmp006.c @@ -264,7 +264,7 @@ int tmp006_get_val(int idx, int *temp_ptr) /*****************************************************************************/ /* Host commands */ -int tmp006_get_calibration(struct host_cmd_handler_args *args) +enum ec_status tmp006_get_calibration(struct host_cmd_handler_args *args) { const struct ec_params_tmp006_get_calibration *p = args->params; struct ec_response_tmp006_get_calibration_v1 *r1 = args->response; @@ -299,7 +299,7 @@ DECLARE_HOST_COMMAND(EC_CMD_TMP006_GET_CALIBRATION, tmp006_get_calibration, EC_VER_MASK(1)); -int tmp006_set_calibration(struct host_cmd_handler_args *args) +enum ec_status tmp006_set_calibration(struct host_cmd_handler_args *args) { const struct ec_params_tmp006_set_calibration_v1 *p1 = args->params; struct tmp006_data_t *tdata; @@ -333,7 +333,7 @@ DECLARE_HOST_COMMAND(EC_CMD_TMP006_SET_CALIBRATION, tmp006_set_calibration, EC_VER_MASK(1)); -int tmp006_get_raw(struct host_cmd_handler_args *args) +enum ec_status tmp006_get_raw(struct host_cmd_handler_args *args) { const struct ec_params_tmp006_get_raw *p = args->params; struct ec_response_tmp006_get_raw *r = args->response; diff --git a/driver/usb_mux/usb_mux.c b/driver/usb_mux/usb_mux.c index 43ebd9841a..122c206b98 100644 --- a/driver/usb_mux/usb_mux.c +++ b/driver/usb_mux/usb_mux.c @@ -227,7 +227,7 @@ DECLARE_CONSOLE_COMMAND(typec, command_typec, "Control type-C connector muxing"); #endif -static int hc_usb_pd_mux_info(struct host_cmd_handler_args *args) +static enum ec_status hc_usb_pd_mux_info(struct host_cmd_handler_args *args) { const struct ec_params_usb_pd_mux_info *p = args->params; struct ec_response_usb_pd_mux_info *r = args->response; |