6 files changed, 20 insertions, 19 deletions
diff --git a/chip/npcx/audio_codec.c b/chip/npcx/audio_codec.c
index 5273e89717..7b1d32a5ff 100644
--- a/chip/npcx/audio_codec.c
+++ b/chip/npcx/audio_codec.c
@@ -13,9 +13,9 @@
 
 #define EC_WOV_I2S_SAMPLE_RATE 48000
 
-typedef int (*codec_i2s_func)(struct host_cmd_handler_args *args);
+typedef enum ec_status (*codec_i2s_func)(struct host_cmd_handler_args *args);
 
-static int codec_set_sample_depth(struct host_cmd_handler_args *args)
+static enum ec_status codec_set_sample_depth(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
@@ -35,7 +35,7 @@ static int codec_set_sample_depth(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 
-static int codec_set_gain(struct host_cmd_handler_args *args)
+static enum ec_status codec_set_gain(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
@@ -46,7 +46,7 @@ static int codec_set_gain(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 
-static int codec_get_gain(struct host_cmd_handler_args *args)
+static enum ec_status codec_get_gain(struct host_cmd_handler_args *args)
 {
 	struct ec_codec_i2s_gain *resp =
 		(struct ec_codec_i2s_gain *)args->response;
@@ -62,7 +62,7 @@ static int codec_get_gain(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 
-static int codec_i2s_enable(struct host_cmd_handler_args *args)
+static enum ec_status codec_i2s_enable(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
@@ -93,7 +93,7 @@ static int codec_i2s_enable(struct host_cmd_handler_args *args)
 	return rv ? EC_RES_ERROR : EC_RES_SUCCESS;
 }
 
-static int codec_i2s_set_fmt(struct host_cmd_handler_args *args)
+static enum ec_status codec_i2s_set_fmt(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
@@ -107,7 +107,8 @@ static int codec_i2s_set_fmt(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 
-static int codec_i2s_set_tdm_config(struct host_cmd_handler_args *args)
+static enum ec_status
+codec_i2s_set_tdm_config(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
@@ -125,7 +126,7 @@ static int codec_i2s_set_tdm_config(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 
-static int codec_i2s_set_bclk(struct host_cmd_handler_args *args)
+static enum ec_status codec_i2s_set_bclk(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
@@ -138,7 +139,7 @@ static int codec_i2s_set_bclk(struct host_cmd_handler_args *args)
 	return EC_RES_SUCCESS;
 }
 
-static int codec_i2s(struct host_cmd_handler_args *args)
+static enum ec_status codec_i2s(struct host_cmd_handler_args *args)
 {
 	struct ec_param_codec_i2s *param =
 		(struct ec_param_codec_i2s *)args->params;
diff --git a/chip/npcx/cec.c b/chip/npcx/cec.c
index 7b02dbe683..effbf6bd46 100644
--- a/chip/npcx/cec.c
+++ b/chip/npcx/cec.c
@@ -836,7 +836,7 @@ static int cec_send(const uint8_t *msg, uint8_t len)
 	return 0;
 }
 
-static int hc_cec_write(struct host_cmd_handler_args *args)
+static enum ec_status hc_cec_write(struct host_cmd_handler_args *args)
 {
 	const struct ec_params_cec_write *params = args->params;
 
@@ -923,7 +923,7 @@ static int cec_set_logical_addr(uint8_t logical_addr)
 	return EC_RES_SUCCESS;
 }
 
-static int hc_cec_set(struct host_cmd_handler_args *args)
+static enum ec_status hc_cec_set(struct host_cmd_handler_args *args)
 {
 	const struct ec_params_cec_set *params = args->params;
 
@@ -939,7 +939,7 @@ static int hc_cec_set(struct host_cmd_handler_args *args)
 DECLARE_HOST_COMMAND(EC_CMD_CEC_SET, hc_cec_set, EC_VER_MASK(0));
 
 
-static int hc_cec_get(struct host_cmd_handler_args *args)
+static enum ec_status hc_cec_get(struct host_cmd_handler_args *args)
 {
 	struct ec_response_cec_get *response = args->response;
 	const struct ec_params_cec_get *params = args->params;
diff --git a/chip/npcx/flash.c b/chip/npcx/flash.c
index f5b124e650..b0cbca536f 100644
--- a/chip/npcx/flash.c
+++ b/chip/npcx/flash.c
@@ -723,7 +723,7 @@ void flash_lock_mapped_storage(int lock)
 #if defined(CONFIG_HOSTCMD_FLASH_SPI_INFO) && !defined(BOARD_NPCX_EVB)
 /* NPCX EVB uses implementation from spi_flash.c */
 
-static int flash_command_spi_info(struct host_cmd_handler_args *args)
+static enum ec_status flash_command_spi_info(struct host_cmd_handler_args *args)
 {
 	struct ec_response_flash_spi_info *r = args->response;
 
diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c
index f32f6d8909..09dc8c7f20 100644
--- a/chip/npcx/lpc.c
+++ b/chip/npcx/lpc.c
@@ -861,7 +861,7 @@ static void lpc_init(void)
 DECLARE_HOOK(HOOK_INIT, lpc_init, HOOK_PRIO_INIT_LPC);
 
 /* Get protocol information */
-static int lpc_get_protocol_info(struct host_cmd_handler_args *args)
+static enum ec_status lpc_get_protocol_info(struct host_cmd_handler_args *args)
 {
 	struct ec_response_get_protocol_info *r = args->response;
 
diff --git a/chip/npcx/shi.c b/chip/npcx/shi.c
index 48ad4f0843..d97963bc3f 100644
--- a/chip/npcx/shi.c
+++ b/chip/npcx/shi.c
@@ -1050,7 +1050,7 @@ DECLARE_HOOK(HOOK_INIT, shi_init, HOOK_PRIO_INIT_CHIPSET - 1);
 /**
  * Get protocol information
  */
-static int shi_get_protocol_info(struct host_cmd_handler_args *args)
+static enum ec_status shi_get_protocol_info(struct host_cmd_handler_args *args)
 {
 	struct ec_response_get_protocol_info *r = args->response;
 
diff --git a/chip/npcx/system.c b/chip/npcx/system.c
index 7eb95b8d34..e247989693 100644
--- a/chip/npcx/system.c
+++ b/chip/npcx/system.c
@@ -999,7 +999,7 @@ DECLARE_CONSOLE_COMMAND(rtc_alarm, command_rtc_alarm_test,
 /* Host commands */
 
 #ifdef CONFIG_HOSTCMD_RTC
-static int system_rtc_get_value(struct host_cmd_handler_args *args)
+static enum ec_status system_rtc_get_value(struct host_cmd_handler_args *args)
 {
 	struct ec_response_rtc *r = args->response;
 
@@ -1012,7 +1012,7 @@ DECLARE_HOST_COMMAND(EC_CMD_RTC_GET_VALUE,
 		system_rtc_get_value,
 		EC_VER_MASK(0));
 
-static int system_rtc_set_value(struct host_cmd_handler_args *args)
+static enum ec_status system_rtc_set_value(struct host_cmd_handler_args *args)
 {
 	const struct ec_params_rtc *p = args->params;
 
@@ -1023,7 +1023,7 @@ DECLARE_HOST_COMMAND(EC_CMD_RTC_SET_VALUE,
 		system_rtc_set_value,
 		EC_VER_MASK(0));
 
-static int system_rtc_set_alarm(struct host_cmd_handler_args *args)
+static enum ec_status system_rtc_set_alarm(struct host_cmd_handler_args *args)
 {
 	const struct ec_params_rtc *p = args->params;
 
@@ -1034,7 +1034,7 @@ DECLARE_HOST_COMMAND(EC_CMD_RTC_SET_ALARM,
 		system_rtc_set_alarm,
 		EC_VER_MASK(0));
 
-static int system_rtc_get_alarm(struct host_cmd_handler_args *args)
+static enum ec_status system_rtc_get_alarm(struct host_cmd_handler_args *args)
 {
 	struct ec_response_rtc *r = args->response;