From: Ziping Chen techping.chan@gmail.com
The "LED_OFF" constant conflicts with the constant with the same name in include/linux/compat.h.
Rename all command constants' name prefix from LED_ to LED_CMD_.
Signed-off-by: Ziping Chen techping.chan@gmail.com --- cmd/led.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/cmd/led.c b/cmd/led.c index 951a5e2..ef0ab1a 100644 --- a/cmd/led.c +++ b/cmd/led.c @@ -62,18 +62,18 @@ static const led_tbl_t led_commands[] = { { NULL, 0, NULL, NULL, NULL } };
-enum led_cmd { LED_ON, LED_OFF, LED_TOGGLE, LED_BLINK }; +enum led_cmd { LED_CMD_ON, LED_CMD_OFF, LED_CMD_TOGGLE, LED_CMD_BLINK };
enum led_cmd get_led_cmd(char *var) { if (strcmp(var, "off") == 0) - return LED_OFF; + return LED_CMD_OFF; if (strcmp(var, "on") == 0) - return LED_ON; + return LED_CMD_ON; if (strcmp(var, "toggle") == 0) - return LED_TOGGLE; + return LED_CMD_TOGGLE; if (strcmp(var, "blink") == 0) - return LED_BLINK; + return LED_CMD_BLINK;
return -1; } @@ -106,27 +106,27 @@ int do_led (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) (strcmp(led_commands[i].string, argv[1]) == 0)) { match = 1; switch (cmd) { - case LED_ON: + case LED_CMD_ON: if (led_commands[i].on) led_commands[i].on(); else __led_set(led_commands[i].mask, CONFIG_LED_STATUS_ON); break; - case LED_OFF: + case LED_CMD_OFF: if (led_commands[i].off) led_commands[i].off(); else __led_set(led_commands[i].mask, CONFIG_LED_STATUS_OFF); break; - case LED_TOGGLE: + case LED_CMD_TOGGLE: if (led_commands[i].toggle) led_commands[i].toggle(); else __led_toggle(led_commands[i].mask); break; - case LED_BLINK: + case LED_CMD_BLINK: if (argc != 4) return CMD_RET_USAGE;