summaryrefslogtreecommitdiff
path: root/power
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-09-30 17:13:02 +0000
committerCommit Bot <commit-bot@chromium.org>2021-10-29 22:33:12 +0000
commit175eb7bc8f31eda0e047e4f850f258ca27c2f3e7 (patch)
tree8588c9eb4eadf9a9dcc7bd021cb8ad0aa11afb15 /power
parent85839a2c40377397bc5d23d12bc3b86bb9d5e137 (diff)
downloadchrome-ec-175eb7bc8f31eda0e047e4f850f258ca27c2f3e7.tar.gz
power/common.c: Add explicit cast when converting between enum types
clang warns: power/common.c:118:28: error: implicit conversion from enumeration type 'enum gpio_signal' to different enumeration type 'enum espi_vw_signal' [-Werror,-Wenum-conversion] return espi_vw_get_wire(signal); ~~~~~~~~~~~~~~~~ ^~~~~~ power/common.c:128:36: error: implicit conversion from enumeration type 'enum gpio_signal' to different enumeration type 'enum espi_vw_signal' [-Werror,-Wenum-conversion] return espi_vw_disable_wire_int(signal); ~~~~~~~~~~~~~~~~~~~~~~~~ ^~~~~~ power/common.c:138:35: error: implicit conversion from enumeration type 'enum gpio_signal' to different enumeration type 'enum espi_vw_signal' [-Werror,-Wenum-conversion] return espi_vw_enable_wire_int(signal); The conversion appears to be intentional, so add an explicit cast. BRANCH=none BUG=b:172020503 TEST=make CC=arm-none-eabi-clang BOARD=elm -j Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: Ide2abc115957385097f6ed938b0a15139cbf3d83 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3197755 Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>
Diffstat (limited to 'power')
-rw-r--r--power/common.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/power/common.c b/power/common.c
index 0f83a2ce61..f3dbdb55f1 100644
--- a/power/common.c
+++ b/power/common.c
@@ -115,7 +115,7 @@ __overridable int power_signal_get_level(enum gpio_signal signal)
if (IS_ENABLED(CONFIG_HOST_ESPI_VW_POWER_SIGNAL)) {
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
- return espi_vw_get_wire(signal);
+ return espi_vw_get_wire((enum espi_vw_signal)signal);
}
return gpio_get_level(signal);
}
@@ -125,7 +125,8 @@ int power_signal_disable_interrupt(enum gpio_signal signal)
if (IS_ENABLED(CONFIG_HOST_ESPI_VW_POWER_SIGNAL)) {
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
- return espi_vw_disable_wire_int(signal);
+ return espi_vw_disable_wire_int(
+ (enum espi_vw_signal)signal);
}
return gpio_disable_interrupt(signal);
}
@@ -135,7 +136,8 @@ int power_signal_enable_interrupt(enum gpio_signal signal)
if (IS_ENABLED(CONFIG_HOST_ESPI_VW_POWER_SIGNAL)) {
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
- return espi_vw_enable_wire_int(signal);
+ return espi_vw_enable_wire_int(
+ (enum espi_vw_signal)signal);
}
return gpio_enable_interrupt(signal);
}
@@ -152,7 +154,8 @@ static const char *power_signal_get_name(enum gpio_signal signal)
if (IS_ENABLED(CONFIG_HOSTCMD_ESPI)) {
/* Check signal is from GPIOs or VWs */
if (espi_signal_is_vw(signal))
- return espi_vw_get_wire_name(signal);
+ return espi_vw_get_wire_name(
+ (enum espi_vw_signal)signal);
}
return gpio_get_name(signal);
}