From cac9cc4b472547f84efd7afb551a6af60f4e130f Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Mon, 4 Oct 2021 21:06:22 +0000 Subject: chip/npcx: Fix enum type clang reports that the enum types do not match: chip/npcx/lpc.c:967:9: error: implicit conversion from enumeration type 'enum ec_error_list' to different enumeration type 'enum ec_status' [-Werror,-Wenum-conversion] return EC_SUCCESS; common/power_button_x86.c:523:9: error: implicit conversion from enumeration type 'enum ec_error_list' to different enumeration type 'enum ec_status' [-Werror,-Wenum-conversion] return EC_SUCCESS; BRANCH=none BUG=b:172020503 TEST=make CC=arm-none-eabi-clang BOARD=aleena Signed-off-by: Tom Hughes Change-Id: I25d1526d58e1e8558153592be7174a8448c130f5 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3202998 Reviewed-by: Daisuke Nojiri --- chip/npcx/lpc.c | 2 +- common/power_button_x86.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chip/npcx/lpc.c b/chip/npcx/lpc.c index adf78b642d..4eee50d714 100644 --- a/chip/npcx/lpc.c +++ b/chip/npcx/lpc.c @@ -964,7 +964,7 @@ static enum ec_status lpc_get_protocol_info(struct host_cmd_handler_args *args) args->response_size = sizeof(*r); - return EC_SUCCESS; + return EC_RES_SUCCESS; } DECLARE_HOST_COMMAND(EC_CMD_GET_PROTOCOL_INFO, lpc_get_protocol_info, diff --git a/common/power_button_x86.c b/common/power_button_x86.c index 661f9b2a3d..b87088e01d 100644 --- a/common/power_button_x86.c +++ b/common/power_button_x86.c @@ -520,7 +520,7 @@ static enum ec_status hc_config_powerbtn_x86(struct host_cmd_handler_args *args) power_button_pulse_enabled = !!(p->flags & EC_POWER_BUTTON_ENABLE_PULSE); - return EC_SUCCESS; + return EC_RES_SUCCESS; } DECLARE_HOST_COMMAND(EC_CMD_CONFIG_POWER_BUTTON, hc_config_powerbtn_x86, EC_VER_MASK(0)); -- cgit v1.2.1