summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Hughes <tomhughes@chromium.org>2021-10-04 22:14:20 +0000
committerCommit Bot <commit-bot@chromium.org>2021-10-05 16:48:18 +0000
commit036cda45bba9fca0137add1d8693a264ba686d71 (patch)
treeb74cff146a7d0bb744933858976be0e7b5108518
parentd7995163073a06e63aa1e48ed7f9a5cb8e1d6fd3 (diff)
downloadchrome-ec-036cda45bba9fca0137add1d8693a264ba686d71.tar.gz
tree: Fix LED enum type
"enum ec_led_colors" was used here instead of "enum led_color". Fixes the following clang warning: error: implicit conversion from enumeration type 'enum led_color' to different enumeration type 'enum ec_led_colors' [-Werror,-Wenum-conversion] This is the same fix as commit 533640b6d2ce1189b8c0559ec69e1d64202d2c8b, but this should fix all instances. These usages were found with: git grep --name-only 'enum led_color' | xargs grep ec_led_colors As indicated by the TEST line, all boards match with this change, except for bloog since it uses the incorrect enum in two places. BRANCH=none BUG=b:172020503 TEST=CC=arm-none-eabi-clang BOARD=<affected board> TEST=./util/compare_build.sh -b all -j 120 => All match except bloog Signed-off-by: Tom Hughes <tomhughes@chromium.org> Change-Id: I75cff3769d5b3b82b9218bfb8584f449fb6a781f Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3203936 Reviewed-by: Aseda Aboagye <aaboagye@chromium.org>
-rw-r--r--board/anahera/led.c2
-rw-r--r--board/bloog/led.c4
-rw-r--r--board/drawcia/led.c2
-rw-r--r--board/gumboz/led.c2
-rw-r--r--board/haboki/led.c2
-rw-r--r--board/jinlon/led.c2
-rw-r--r--board/lantis/led.c2
-rw-r--r--board/morphius/led.c4
-rw-r--r--board/redrix/led.c2
9 files changed, 11 insertions, 11 deletions
diff --git a/board/anahera/led.c b/board/anahera/led.c
index bd088bfe97..c794bc8b5f 100644
--- a/board/anahera/led.c
+++ b/board/anahera/led.c
@@ -76,7 +76,7 @@ static void led_set_color_battery(int port, enum led_color color)
}
}
-void led_set_color_power(enum ec_led_colors color)
+void led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
diff --git a/board/bloog/led.c b/board/bloog/led.c
index ba1a865890..609b330a56 100644
--- a/board/bloog/led.c
+++ b/board/bloog/led.c
@@ -47,7 +47,7 @@ static void led_set_color_battery(int port, enum led_color color)
(color == LED_WHITE) ? BAT_LED_ON : BAT_LED_OFF);
}
-void led_set_color_power(enum ec_led_colors color)
+void led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
@@ -101,7 +101,7 @@ int led_set_brightness(enum ec_led_id led_id, const uint8_t *brightness)
break;
case EC_LED_ID_POWER_LED:
if (brightness[EC_LED_COLOR_WHITE] != 0)
- led_set_color_power(EC_LED_COLOR_WHITE);
+ led_set_color_power(LED_WHITE);
else
led_set_color_power(LED_OFF);
break;
diff --git a/board/drawcia/led.c b/board/drawcia/led.c
index 68242180fa..42518c71fc 100644
--- a/board/drawcia/led.c
+++ b/board/drawcia/led.c
@@ -52,7 +52,7 @@ static int led_set_color_battery(enum led_color color)
return EC_SUCCESS;
}
-static int led_set_color_power(enum ec_led_colors color)
+static int led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
diff --git a/board/gumboz/led.c b/board/gumboz/led.c
index 0640a6cd21..8565da313f 100644
--- a/board/gumboz/led.c
+++ b/board/gumboz/led.c
@@ -81,7 +81,7 @@ static void led_set_color_battery(int port, enum led_color color)
}
}
-void led_set_color_power(enum ec_led_colors color)
+void led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
diff --git a/board/haboki/led.c b/board/haboki/led.c
index 18b875b85f..851124bfde 100644
--- a/board/haboki/led.c
+++ b/board/haboki/led.c
@@ -52,7 +52,7 @@ static int led_set_color_battery(enum led_color color)
return EC_SUCCESS;
}
-static int led_set_color_power(enum ec_led_colors color)
+static int led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
diff --git a/board/jinlon/led.c b/board/jinlon/led.c
index 18dfb67f78..4cef6dc3ae 100644
--- a/board/jinlon/led.c
+++ b/board/jinlon/led.c
@@ -65,7 +65,7 @@ static void led_set_color_battery(int port, enum led_color color)
}
}
-void led_set_color_power(enum ec_led_colors color)
+void led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
diff --git a/board/lantis/led.c b/board/lantis/led.c
index c4868de740..97afef2f02 100644
--- a/board/lantis/led.c
+++ b/board/lantis/led.c
@@ -66,7 +66,7 @@ static int led_set_color_battery(int port, enum led_color color)
return EC_SUCCESS;
}
-static int led_set_color_power(enum ec_led_colors color)
+static int led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF:
diff --git a/board/morphius/led.c b/board/morphius/led.c
index fc57b46d6b..5e72653fe3 100644
--- a/board/morphius/led.c
+++ b/board/morphius/led.c
@@ -54,12 +54,12 @@ static const uint8_t color_brightness[2] = {
[LED_WHITE] = 100,
};
-void led_set_color_power(enum ec_led_colors color)
+void led_set_color_power(enum led_color color)
{
pwm_set_duty(PWM_CH_POWER_LED, color_brightness[color]);
}
-void led_set_color_battery(enum ec_led_colors color)
+void led_set_color_battery(enum led_color color)
{
uint32_t board_ver = 0;
int led_batt_on_lvl, led_batt_off_lvl;
diff --git a/board/redrix/led.c b/board/redrix/led.c
index bd088bfe97..c794bc8b5f 100644
--- a/board/redrix/led.c
+++ b/board/redrix/led.c
@@ -76,7 +76,7 @@ static void led_set_color_battery(int port, enum led_color color)
}
}
-void led_set_color_power(enum ec_led_colors color)
+void led_set_color_power(enum led_color color)
{
switch (color) {
case LED_OFF: