summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-10-07 18:59:05 +0000
committerCommit Bot <commit-bot@chromium.org>2021-10-11 19:15:35 +0000
commit187f9155f684d0aeda4546bf04451ae8825f2de8 (patch)
tree66c599da874c38e293d82541cb5960eae5093dd2
parentea0cc2a17e63a07f0a4c97760292778916b2e41d (diff)
downloadchrome-ec-187f9155f684d0aeda4546bf04451ae8825f2de8.tar.gz
tree: Use correct enum when calling button_disable_gpio
When building with clang, it warns: board/puff/board.c:484:23: error: implicit conversion from enumeration type 'enum gpio_signal' to different enumeration type 'enum button' [-Werror,-Wenum-conversion] button_disable_gpio(GPIO_EC_RECOVERY_BTN_ODL); button_disable_gpio() takes an "enum button", not "enum gpio_signal". BRANCH=none BUG=b:172020503 TEST=make CC=arm-none-eabi-clang BOARD=puff Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: Ic8347e4d6cda0fde824c9edf1979f7f5197e3db4 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3213110 Reviewed-by: Keith Short <keithshort@chromium.org> Reviewed-by: Andrew McRae <amcrae@google.com>
-rw-r--r--board/ambassador/board.c2
-rw-r--r--board/genesis/board.c2
-rw-r--r--board/moonbuggy/board.c2
-rw-r--r--board/puff/board.c2
-rw-r--r--board/scout/board.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/board/ambassador/board.c b/board/ambassador/board.c
index f8dc910070..94ceac98e4 100644
--- a/board/ambassador/board.c
+++ b/board/ambassador/board.c
@@ -477,7 +477,7 @@ static void board_init(void)
* button is not available.
*/
if (board_version < 2)
- button_disable_gpio(GPIO_EC_RECOVERY_BTN_ODL);
+ button_disable_gpio(BUTTON_RECOVERY);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
diff --git a/board/genesis/board.c b/board/genesis/board.c
index 6f397bf1ab..2a44d4416a 100644
--- a/board/genesis/board.c
+++ b/board/genesis/board.c
@@ -310,7 +310,7 @@ static void board_init(void)
* button is not available.
*/
if (board_version < 2)
- button_disable_gpio(GPIO_EC_RECOVERY_BTN_ODL);
+ button_disable_gpio(BUTTON_RECOVERY);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
diff --git a/board/moonbuggy/board.c b/board/moonbuggy/board.c
index 8322f2ef82..c69acde7e1 100644
--- a/board/moonbuggy/board.c
+++ b/board/moonbuggy/board.c
@@ -310,7 +310,7 @@ static void board_init(void)
* button is not available.
*/
if (board_version < 2)
- button_disable_gpio(GPIO_EC_RECOVERY_BTN_ODL);
+ button_disable_gpio(BUTTON_RECOVERY);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
diff --git a/board/puff/board.c b/board/puff/board.c
index b71d6670aa..d25323faba 100644
--- a/board/puff/board.c
+++ b/board/puff/board.c
@@ -479,7 +479,7 @@ static void board_init(void)
* button is not available.
*/
if (board_version < 2)
- button_disable_gpio(GPIO_EC_RECOVERY_BTN_ODL);
+ button_disable_gpio(BUTTON_RECOVERY);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);
diff --git a/board/scout/board.c b/board/scout/board.c
index 7c87f97ec8..09e171a21f 100644
--- a/board/scout/board.c
+++ b/board/scout/board.c
@@ -338,7 +338,7 @@ static void board_init(void)
* button is not available.
*/
if (board_version < 2)
- button_disable_gpio(GPIO_EC_RECOVERY_BTN_ODL);
+ button_disable_gpio(BUTTON_RECOVERY);
}
DECLARE_HOOK(HOOK_INIT, board_init, HOOK_PRIO_DEFAULT);